summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Only add newlines for multiple uploadsremove-double-newline-for-single-attachmentsLuke "Jared" Bennett2017-04-143-5/+13
* Merge branch 'use-hashie-forbidden_attributes' into 'master' Rémy Coutable2017-04-143-1/+11
|\
| * Use the hashie-forbideen_attributes gemandrew brown2017-04-093-1/+11
* | Merge branch 'revert-a0d734c9' into 'master' Stan Hu2017-04-141-1/+1
|\ \
| * | Revert "Merge branch 'grpc-1.2.2' into 'master'"revert-a0d734c9Lin Jen-Shin (godfat)2017-04-141-1/+1
* | | Merge branch 'patch-17' into 'master' Rémy Coutable2017-04-141-1/+1
|\ \ \
| * | | Update show.html.haml to allow guests to see the Files tab as per https://git...AJ ONeal2017-04-121-1/+1
* | | | Merge branch '30349-create-users-build-service' into 'master' Rémy Coutable2017-04-147-160/+176
|\ \ \ \
| * | | | Refactor build_service_specGeorge Andrinopoulos2017-04-131-4/+2
| * | | | Implement Users::BuildServicegeoandri2017-04-137-160/+178
* | | | | Merge branch 'patch-14' into 'master' Rémy Coutable2017-04-141-1/+1
|\ \ \ \ \
| * | | | | Enable the import_url field. Rune Philosof2017-02-221-1/+1
* | | | | | Merge branch 'branch-versions' into 'master' Rémy Coutable2017-04-147-86/+67
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Expand components version specification format to allow branchesbranch-versionsAlejandro Rodríguez2017-04-137-86/+67
* | | | | | Merge branch 'sh-improve-logging-for-bad-creations' into 'master'Robert Speicher2017-04-142-0/+17
|\ \ \ \ \ \
| * | | | | | Improve error messages when a record is unable to be created for a projectStan Hu2017-04-132-0/+17
* | | | | | | Merge branch '30907-allow-to-enable-rspec-profile-for-a-given-branch' into 'm...Robert Speicher2017-04-131-2/+8
|\ \ \ \ \ \ \
| * | | | | | | Allow to enable `rspec_profiling` for a branch on the CI30907-allow-to-enable-rspec-profile-for-a-given-branchRémy Coutable2017-04-131-2/+8
* | | | | | | | Merge branch 'issues-empty-state-not-centered' into 'master' Annabel Dunstone Gray2017-04-132-2/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Centered empty state for issuesJose Ivan Vargas2017-04-132-2/+8
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'pms-lighter-colors' into 'master' Annabel Dunstone Gray2017-04-132-13/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Add lighter color variables. Fix active note color.pms-lighter-colorsPedro Moreira da Silva2017-04-132-13/+21
* | | | | | | | | Merge branch 'clear-instructions' into 'master' Yorick Peterse2017-04-131-8/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make instructions clearerclear-instructionsSid Sijbrandij2017-04-131-8/+5
* | | | | | | | | | Merge branch 'sh-add-icon-for-active-service-template' into 'master'Robert Speicher2017-04-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Use an icon to indicate whether service template is activeStan Hu2017-04-131-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix-appending-state-to-issuable-references' into 'master' Robert Speicher2017-04-132-13/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix appending state to issuable referencesfix-appending-state-to-issuable-referencesAdam Niedzielski2017-04-132-13/+34
* | | | | | | | | | Merge branch 'fix-trace-seeking-readline' into 'master' Kamil Trzciński2017-04-135-10/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update tests for the fact that we would skip one linefix-trace-seeking-readlineLin Jen-Shin2017-04-131-3/+3
| * | | | | | | | | | Don't seek at all if the log is small anywayLin Jen-Shin2017-04-131-5/+3
| * | | | | | | | | | Add changelog entryLin Jen-Shin2017-04-131-0/+4
| * | | | | | | | | | After Trace#limit, we seek to the next line in caseLin Jen-Shin2017-04-134-3/+32
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'empty-task-list-alignment' into 'master' jej/master-greenjej-master-greenAnnabel Dunstone Gray2017-04-132-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed alignment of empty task list itemsempty-task-list-alignmentPhil Hughes2017-04-112-0/+5
* | | | | | | | | | | Merge branch 'notebook-katex-rendering-improvements' into 'master' Jacob Schatz2017-04-131-15/+44
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Correctly parse katex math in IPyhton notebooksnotebook-katex-rendering-improvementsPhil Hughes2017-04-131-15/+44
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/gb/fix-registry-for-uppercased-project-paths' into 'master' Kamil Trzciński2017-04-134-8/+35
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Sanitize container repository path in model classfix/gb/fix-registry-for-uppercased-project-pathsGrzegorz Bizon2017-04-133-5/+16
| * | | | | | | | | Fix registry for projects with uppercases in pathGrzegorz Bizon2017-04-132-4/+20
* | | | | | | | | | Merge branch '30622-resolve-note-loading-icon-gone' into 'master' Filipa Lacerda2017-04-133-4/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Review changes30622-resolve-note-loading-icon-goneLuke "Jared" Bennett2017-04-121-0/+5
| * | | | | | | | | | Fix resolve spinner and add testLuke "Jared" Bennett2017-04-113-4/+4
* | | | | | | | | | | Merge branch '30188-handle-remove-branch-failure' into 'master' Filipa Lacerda2017-04-133-5/+58
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | tests for success and failure of deleting branch from MR page30188-handle-remove-branch-failureSimon Knox2017-04-133-1/+54
| * | | | | | | | | | fix js error in MR remove branch failure handlerSimon Knox2017-04-121-4/+4
* | | | | | | | | | | Merge branch 'remove-iife-cycle-analytics-bundle' into 'master' 26510-should-project-updated-time-actually-be-the-last-activity-timeFilipa Lacerda2017-04-1312-697/+682
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove IIFEs from files in cycle_analytics_bundle.jsremove-iife-cycle-analytics-bundleAlfredo Sumaran2017-04-1012-697/+682
* | | | | | | | | | | | Merge branch 'remove-iife-boards-bundle' into 'master' Filipa Lacerda2017-04-1318-1269/+1232
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove IIFEs in boards_bundle.jsremove-iife-boards-bundleAlfredo Sumaran2017-04-1018-1269/+1232