- 18 10月, 2016 4 次提交
-
-
由 Grzegorz Bizon 提交于
-
由 Grzegorz Bizon 提交于
-
由 Grzegorz Bizon 提交于
-
由 Kamil Trzcinski 提交于
-
- 17 10月, 2016 2 次提交
-
-
由 Kamil Trzcinski 提交于
-
由 Kamil Trzcinski 提交于
-
- 14 10月, 2016 7 次提交
-
-
由 Z.J. van de Weg 提交于
-
由 Z.J. van de Weg 提交于
-
由 Z.J. van de Weg 提交于
-
由 Luke Bennett 提交于
-
由 Z.J. van de Weg 提交于
-
由 Z.J. van de Weg 提交于
-
由 Sean McGivern 提交于
When reading conflicts: 1. Add a `type` field. `text` works as before, and has `sections`; `text-editor` is a file with ambiguous conflict markers that can only be resolved in an editor. 2. Add a `content_path` field pointing to a JSON representation of the file's content for a single file. 3. Hitting `content_path` returns a similar datastructure to the `file`, but without the `content_path` and `sections` fields, and with a `content` field containing the full contents of the file (with conflict markers). When writing conflicts: 1. Instead of `sections` being at the top level, they are now in a `files` array. This matches the read format better. 2. The `files` array contains file hashes, each of which must contain: a. `new_path` b. `old_path` c. EITHER `sections` (which works as before) or `content` (with the full content of the resolved file).
-
- 08 10月, 2016 1 次提交
-
-
由 James Edwards-Jones 提交于
-
- 06 10月, 2016 2 次提交
-
-
由 James 提交于
-
由 Paco Guzman 提交于
-
- 03 10月, 2016 1 次提交
-
-
由 Thomas Balthazar 提交于
It toggles the 'WIP' prefix in the MR title.
-
- 30 9月, 2016 5 次提交
-
-
由 Katarzyna Kobierska 提交于
-
由 Katarzyna Kobierska 提交于
-
由 Katarzyna Kobierska 提交于
-
由 Katarzyna Kobierska 提交于
-
由 Tony Gambone 提交于
-
- 22 9月, 2016 1 次提交
-
-
由 Rémy Coutable 提交于
Signed-off-by: NRémy Coutable <remy@rymai.me>
-
- 20 9月, 2016 1 次提交
-
-
由 barthc 提交于
-
- 16 9月, 2016 1 次提交
-
-
由 Katarzyna Kobierska 提交于
-
- 13 9月, 2016 2 次提交
-
-
由 Katarzyna Kobierska 提交于
-
由 Katarzyna Kobierska 提交于
-
- 07 9月, 2016 5 次提交
-
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Dmitriy Zaporozhets 提交于
* Use version numbers instead of sha as more user-friendly * Make it clear that we compare later version (left) with older one (right) * Improve wording of version switch panel Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 01 9月, 2016 1 次提交
-
-
由 Felipe Artur 提交于
-
- 25 8月, 2016 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
* Add MergeRequestDiff#latest? * Remove unnecessary variable assignment Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 22 8月, 2016 2 次提交
-
-
由 Valery Sizov 提交于
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 19 8月, 2016 1 次提交
-
-
由 Douwe Maan 提交于
-
- 18 8月, 2016 2 次提交
-
-
由 Ruben Davila 提交于
-
由 Alfredo Sumaran 提交于
-
- 15 8月, 2016 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-