Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reorganize feature specs for MR notesclean-merge_request-diff-notes-specs | Rémy Coutable | 2017-04-14 | 5 | -523/+470 |
* | Merge branch 'revert-a0d734c9' into 'master' | Stan Hu | 2017-04-14 | 1 | -1/+1 |
|\ | |||||
| * | Revert "Merge branch 'grpc-1.2.2' into 'master'"revert-a0d734c9 | Lin Jen-Shin (godfat) | 2017-04-14 | 1 | -1/+1 |
* | | Merge branch 'patch-17' into 'master' | Rémy Coutable | 2017-04-14 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update show.html.haml to allow guests to see the Files tab as per https://git... | AJ ONeal | 2017-04-12 | 1 | -1/+1 |
* | | | Merge branch '30349-create-users-build-service' into 'master' | Rémy Coutable | 2017-04-14 | 7 | -160/+176 |
|\ \ \ | |||||
| * | | | Refactor build_service_spec | George Andrinopoulos | 2017-04-13 | 1 | -4/+2 |
| * | | | Implement Users::BuildService | geoandri | 2017-04-13 | 7 | -160/+178 |
* | | | | Merge branch 'patch-14' into 'master' | Rémy Coutable | 2017-04-14 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Enable the import_url field. | Rune Philosof | 2017-02-22 | 1 | -1/+1 |
* | | | | | Merge branch 'branch-versions' into 'master' | Rémy Coutable | 2017-04-14 | 7 | -86/+67 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Expand components version specification format to allow branchesbranch-versions | Alejandro Rodríguez | 2017-04-13 | 7 | -86/+67 |
* | | | | | Merge branch 'sh-improve-logging-for-bad-creations' into 'master' | Robert Speicher | 2017-04-14 | 2 | -0/+17 |
|\ \ \ \ \ | |||||
| * | | | | | Improve error messages when a record is unable to be created for a project | Stan Hu | 2017-04-13 | 2 | -0/+17 |
* | | | | | | Merge branch '30907-allow-to-enable-rspec-profile-for-a-given-branch' into 'm... | Robert Speicher | 2017-04-13 | 1 | -2/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow to enable `rspec_profiling` for a branch on the CI30907-allow-to-enable-rspec-profile-for-a-given-branch | Rémy Coutable | 2017-04-13 | 1 | -2/+8 |
* | | | | | | | Merge branch 'issues-empty-state-not-centered' into 'master' | Annabel Dunstone Gray | 2017-04-13 | 2 | -2/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Centered empty state for issues | Jose Ivan Vargas | 2017-04-13 | 2 | -2/+8 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'pms-lighter-colors' into 'master' | Annabel Dunstone Gray | 2017-04-13 | 2 | -13/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add lighter color variables. Fix active note color.pms-lighter-colors | Pedro Moreira da Silva | 2017-04-13 | 2 | -13/+21 |
* | | | | | | | | Merge branch 'clear-instructions' into 'master' | Yorick Peterse | 2017-04-13 | 1 | -8/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Make instructions clearerclear-instructions | Sid Sijbrandij | 2017-04-13 | 1 | -8/+5 |
* | | | | | | | | | Merge branch 'sh-add-icon-for-active-service-template' into 'master' | Robert Speicher | 2017-04-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Use an icon to indicate whether service template is active | Stan Hu | 2017-04-13 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'fix-appending-state-to-issuable-references' into 'master' | Robert Speicher | 2017-04-13 | 2 | -13/+34 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix appending state to issuable referencesfix-appending-state-to-issuable-references | Adam Niedzielski | 2017-04-13 | 2 | -13/+34 |
* | | | | | | | | | Merge branch 'fix-trace-seeking-readline' into 'master' | Kamil Trzciński | 2017-04-13 | 5 | -10/+41 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update tests for the fact that we would skip one linefix-trace-seeking-readline | Lin Jen-Shin | 2017-04-13 | 1 | -3/+3 |
| * | | | | | | | | | Don't seek at all if the log is small anyway | Lin Jen-Shin | 2017-04-13 | 1 | -5/+3 |
| * | | | | | | | | | Add changelog entry | Lin Jen-Shin | 2017-04-13 | 1 | -0/+4 |
| * | | | | | | | | | After Trace#limit, we seek to the next line in case | Lin Jen-Shin | 2017-04-13 | 4 | -3/+32 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'empty-task-list-alignment' into 'master' jej/master-greenjej-master-green | Annabel Dunstone Gray | 2017-04-13 | 2 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fixed alignment of empty task list itemsempty-task-list-alignment | Phil Hughes | 2017-04-11 | 2 | -0/+5 |
* | | | | | | | | | | Merge branch 'notebook-katex-rendering-improvements' into 'master' | Jacob Schatz | 2017-04-13 | 1 | -15/+44 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Correctly parse katex math in IPyhton notebooksnotebook-katex-rendering-improvements | Phil Hughes | 2017-04-13 | 1 | -15/+44 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix/gb/fix-registry-for-uppercased-project-paths' into 'master' | Kamil Trzciński | 2017-04-13 | 4 | -8/+35 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Sanitize container repository path in model classfix/gb/fix-registry-for-uppercased-project-paths | Grzegorz Bizon | 2017-04-13 | 3 | -5/+16 |
| * | | | | | | | | Fix registry for projects with uppercases in path | Grzegorz Bizon | 2017-04-13 | 2 | -4/+20 |
* | | | | | | | | | Merge branch '30622-resolve-note-loading-icon-gone' into 'master' | Filipa Lacerda | 2017-04-13 | 3 | -4/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Review changes30622-resolve-note-loading-icon-gone | Luke "Jared" Bennett | 2017-04-12 | 1 | -0/+5 |
| * | | | | | | | | | Fix resolve spinner and add test | Luke "Jared" Bennett | 2017-04-11 | 3 | -4/+4 |
* | | | | | | | | | | Merge branch '30188-handle-remove-branch-failure' into 'master' | Filipa Lacerda | 2017-04-13 | 3 | -5/+58 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | tests for success and failure of deleting branch from MR page30188-handle-remove-branch-failure | Simon Knox | 2017-04-13 | 3 | -1/+54 |
| * | | | | | | | | | fix js error in MR remove branch failure handler | Simon Knox | 2017-04-12 | 1 | -4/+4 |
* | | | | | | | | | | Merge branch 'remove-iife-cycle-analytics-bundle' into 'master' 26510-should-project-updated-time-actually-be-the-last-activity-time | Filipa Lacerda | 2017-04-13 | 12 | -697/+682 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove IIFEs from files in cycle_analytics_bundle.jsremove-iife-cycle-analytics-bundle | Alfredo Sumaran | 2017-04-10 | 12 | -697/+682 |
* | | | | | | | | | | | Merge branch 'remove-iife-boards-bundle' into 'master' | Filipa Lacerda | 2017-04-13 | 18 | -1269/+1232 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Remove IIFEs in boards_bundle.jsremove-iife-boards-bundle | Alfredo Sumaran | 2017-04-10 | 18 | -1269/+1232 |
* | | | | | | | | | | | Merge branch '30779-show-mr-subnav-issue-tracker' into 'master' | Alfredo Sumaran | 2017-04-13 | 12 | -9/+41 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Show sub-nav under Merge Requests when issue tracker is non-default | Kushal Pandya | 2017-04-13 | 12 | -9/+41 |
|/ / / / / / / / / / |