summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ignore vscode config filesignore-vscodeSimon Knox2017-08-081-0/+1
* Merge branch '35136-barchart-not-display-label-at-0-hour' into 'master'Clement Ho2017-08-083-21/+23
|\
| * Fix bar chart does not display label at hour 0Jason Dai2017-08-083-21/+23
|/
* Merge branch 'winh-scope-haml-linter' into 'master'Grzegorz Bizon2017-08-081-9/+11
|\
| * Restrict InlineJavaScript for haml_lint to dev and test environmentwinh-scope-haml-linterwinh2017-08-081-9/+11
* | Merge branch 'project_events_noteable_iid' into 'master'Rémy Coutable2017-08-085-3/+90
|\ \
| * | Expose noteable_iid in Notesue4452017-08-085-3/+90
|/ /
* | Merge branch 'rc/fix-tags-api' into 'master'Sean McGivern2017-08-089-184/+388
|\ \
| * | Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name...Rémy Coutable2017-08-089-184/+388
* | | Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into 'mas...Rémy Coutable2017-08-083-18/+27
|\ \ \
| * | | Print the setup steps and duration and fix an issue resulting in re-setuping ...35941-fix-testing-issue-following-gitaly-install-fixRémy Coutable2017-08-043-9/+18
| * | | Unset the RUBYOPT env variable before installing gitaly-rubyRémy Coutable2017-08-043-6/+11
| * | | Revert "Merge branch 'fix-gitaly-install' into 'master'"Rémy Coutable2017-08-043-17/+12
* | | | Merge branch '35002_add_italian_translations_of_pipeline_schedules' into 'mas...Rémy Coutable2017-08-081-3/+27
|\ \ \ \ | |_|/ / |/| | |
| * | | Add Italian translations of Pipeline SchedulesHuang Tao2017-08-081-3/+27
|/ / /
* | | Merge branch 'document-and-test-api-iids' into 'master'Rémy Coutable2017-08-084-8/+8
|\ \ \
| * | | Fix the iids parameters in the API documentationFrank Pavageau2017-08-074-8/+8
* | | | Merge branch 'ide' into 'master'Mike Greiling2017-08-08101-239/+3706
|\ \ \ \
| * \ \ \ Merge branch 'master' into ideMike Greiling2017-08-07204-4690/+3960
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch '24685_view_self' into 'master'Jacob Schatz2017-08-086-22/+35
|\ \ \ \ \
| * | | | | Show all labelsRegis Boudinot2017-08-086-22/+35
|/ / / / /
* | | | | Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-0829-55/+196
|\ \ \ \ \
| * | | | | Exclude merge_jid on Import/Export attribute configurationOswaldo Ferreira2017-08-071-0/+1
| * | | | | Re-add column locked_at on migration rollback31207-clean-locked-merge-requestsOswaldo Ferreira2017-08-071-1/+1
| * | | | | Move locked_at removal to post-deployment migrationOswaldo Ferreira2017-08-073-2/+3
| * | | | | Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-0728-54/+193
* | | | | | Merge branch '33874_confi' into 'master'Jacob Schatz2017-08-0714-28/+434
|\ \ \ \ \ \
| * | | | | | 33874 confidential issue redesignRegis Boudinot2017-08-0714-28/+434
|/ / / / / /
* | | | | | Merge branch '35729-user-dropdown-in-filtered-search-does-not-load-avatar-on-...Clement Ho2017-08-074-3/+7
|\ \ \ \ \ \
| * | | | | | Resolve "User dropdown in filtered search does not load avatar on `master`"Tim Zallmann2017-08-074-3/+7
|/ / / / / /
* | | | | | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'Robert Speicher2017-08-073-20/+63
|\ \ \ \ \ \
| * | | | | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitalyAhmad Sherif2017-08-076-24/+67
| |/ / / / /
* | | | | | Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'Robert Speicher2017-08-075-5/+25
|\ \ \ \ \ \
| * | | | | | Migrate Gitlab::Git::Repository#size to Gitalyfeature/migrate-repository-size-to-gitalyAhmad Sherif2017-08-075-5/+25
| |/ / / / /
* | | | | | Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-0714-14/+198
|\ \ \ \ \ \
| * | | | | | Move some after_create parts to worker to improve performance32844-issuables-performanceJarka Kadlecova2017-08-0714-14/+198
* | | | | | | Merge branch 'perf.policy-runner-reduce-loops' into 'master'Sean McGivern2017-08-071-5/+7
|\ \ \ \ \ \ \
| * | | | | | | more eagerly bail when the state is preventedhttp://jneen.net/2017-08-071-4/+3
| * | | | | | | reduce iterations by keeping a count of remaining enablershttp://jneen.net/2017-08-071-1/+4
* | | | | | | | Merge branch 'zj-add-ci-metrics' into 'master'Sean McGivern2017-08-072-0/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Add two more metrics for CI/CDzj-add-ci-metricsZ.J. van de Weg2017-07-312-0/+42
* | | | | | | | | Merge branch 'collapse-sidebar-bugs' into 'master'Phil Hughes2017-08-078-7/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add class to other sidebarsAnnabel Dunstone Gray2017-08-073-3/+3
| * | | | | | | | | Check if sidebar existscollapse-sidebar-bugsAnnabel Dunstone Gray2017-08-071-1/+1
| * | | | | | | | | Remove JS flicker on page load; UI tweaksAnnabel Dunstone Gray2017-08-075-4/+12
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'group-new-issue' into 'master'Clement Ho2017-08-079-18/+251
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Group-level new issue & MR using previously selected projectBryce Johnson2017-08-079-18/+251
|/ / / / / / / /
* | | | | | | | Merge branch '35761-convdev-perc' into 'master'Sean McGivern2017-08-0711-16/+159
|\ \ \ \ \ \ \ \
| * | | | | | | | Store & use ConvDev percentages returned by Version app35761-convdev-percJarka Kadlecova2017-08-0711-16/+159
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'feature/log-provider' into 'master'Sean McGivern2017-08-071-6/+15
|\ \ \ \ \ \ \ \
View Lorry Controller Status