summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ...Valery Sizov2017-05-0528-49/+217
|\
| * Merge branch 'prometheus-integration-test-setting-fix' into 'master' Robert Speicher2017-05-051-0/+6
| |\
| | * Improved changelog entry, also changed error message for HTTParty errorprometheus-integration-test-setting-fixJose Ivan Vargas2017-05-041-1/+1
| | * Improved code styling and added a HTTParty rescue blockJose Ivan Vargas2017-05-041-0/+2
| | * Added specsJose Ivan Vargas2017-05-041-5/+5
| | * Added rescue block for the test method for the prometheus serviceJose Ivan Vargas2017-05-041-1/+5
| * | Merge branch 'mrchrisw-import-shell-timeout'Sean McGivern2017-05-051-2/+2
| |\ \
| | * | Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeoutChris Wilson2017-04-271-2/+2
| * | | Fix email receiver metrics eventsfix-email-receiver-metricsSean McGivern2017-05-053-3/+3
| * | | Merge branch 'adam-separate-slash-commands' into 'master' Rémy Coutable2017-05-052-15/+83
| |\ \ \
| | * | | Display slash commands outcome when previewing Markdownadam-separate-slash-commandsRares Sfirlogea2017-05-042-15/+83
| * | | | Some small updates for Spanish translations.Ruben Davila2017-05-043-3/+3
| * | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-0423-98/+162
| |\ \ \ \
| | * | | | Fix wording of Cycle Analytics stage legendsDouwe Maan2017-05-043-3/+3
| | | |_|/ | | |/| |
| | * | | Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-041-0/+6
| | |\ \ \
| | | * | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-041-0/+6
| | * | | | Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master' Douwe Maan2017-05-041-7/+10
| | |\ \ \ \
| | | * | | | Sort the network graph both by commit date and topographically.30973-network-graph-sorted-by-date-and-topoTimothy Andrew2017-05-041-7/+10
| | * | | | | Merge branch 'gitlab-shell-compile' into 'master' Rémy Coutable2017-05-041-2/+8
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Compile gitlab-shell go executablesJacob Vosmaer2017-05-041-2/+8
| | * | | | | Merge branch '12910-uploader-pers-snippet' into 'master' Sean McGivern2017-05-043-3/+3
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-023-3/+3
| * | | | | | Add CHANGELOG entry, some specs and locale file for German.Ruben Davila2017-05-041-3/+4
| * | | | | | More updates for translations plus some refactoring.Ruben Davila2017-05-0314-10/+59
| * | | | | | More translations updates.Ruben Davila2017-05-037-7/+7
| * | | | | | First round of updates from the code review.Ruben Davila2017-05-021-3/+9
| * | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-0275-332/+1732
| |\ \ \ \ \ \
| * | | | | | | Fix Rubocop complains.Ruben Davila2017-05-021-21/+2
| * | | | | | | Add more translation for Spanish.Ruben Davila2017-04-267-7/+7
| * | | | | | | Add ability to parse *.vue files through the `ruby gettext:find` scriptRuben Davila2017-04-251-0/+33
| * | | | | | | Some small fixes for the current I18n implementationRuben Davila2017-04-201-3/+3
| * | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-04-1922-70/+223
| |\ \ \ \ \ \ \
| * | | | | | | | Fix Rubocop complains plus some small refactorRuben Davila2017-04-191-5/+5
| * | | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-pagePhil Hughes2017-04-148-43/+30
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Set locale through controller filterRuben Davila2017-04-131-3/+3
| * | | | | | | | | Add support to change language in profile formRuben Davila2017-04-121-0/+9
* | | | | | | | | | [Multiple issue assignee] Fix a number of specsValery Sizov2017-05-051-1/+1
* | | | | | | | | | [Multiple issue assignee]: reslving some conflictsValery Sizov2017-05-041-4/+0
* | | | | | | | | | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-0413-38/+76
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into 'm...Sean McGivern2017-05-041-5/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Handle incoming emails from aliases correctly2247-emails-forwarded-to-service-desk-email-don-t-comeSean McGivern2017-05-031-5/+11
* | | | | | | | | | Merge branch '31647-fix-snippet-content_html' into 'master' Rémy Coutable2017-05-042-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix caching large snippet HTML content on MySQL databasesNick Thomas2017-05-032-0/+3
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '31544-size-of-project-from-api' into 'master' Rémy Coutable2017-05-041-5/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Expose project statistics on single requests via the APIMark Fletcher2017-05-031-5/+9
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch '31671-merge-request-message-contains-carriage-returns' into 'ma...Douwe Maan2017-05-031-21/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | removes the possibility of commit messages having carriage returnsTiago Botelho2017-05-031-21/+0
* | | | | | | | | | Merge branch 'dm-blob-external-storage' into 'master' Sean McGivern2017-05-031-2/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storageDouwe Maan2017-05-031-2/+10
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Fix project tree saver and fork spec failuresJames Lopez2017-05-031-0/+1
| |_|_|/ / / / / / |/| | | | | | | |