summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into categorize_sear...categorize_search_query_in_project_headerFatih Acet2016-06-0237-53/+117
|\
| * Merge branch '14446-no_group_avatar-png-link' into 'master' Rémy Coutable2016-06-022-1/+2
| |\
| | * Fix link to blank group iconSean McGivern2016-06-022-1/+2
| * | Merge branch 'chujinjin/gitlab-ce-fix_wiki_project_clone_address_error' into ...Rémy Coutable2016-06-022-1/+2
| |\ \ | | |/ | |/|
| | * Fix wiki project clone address errorchujinjin/gitlab-ce-fix_wiki_project_clone_address_errorchujinjin2016-06-022-1/+2
| * | Merge branch 'minor_doc_updates' into 'master' Achilleas Pipinellis2016-06-022-2/+10
| |\ \ | | |/ | |/|
| | * Explicitly mention advisory file lockingDrew Blessing2016-06-011-2/+2
| | * Add gdb detach instructionsDrew Blessing2016-06-011-0/+8
| * | Merge branch 'cs-unnecessary-assets' into 'master' Robert Speicher2016-06-0216-8/+39
| |\ \
| | * | Move JS graph specs to match assets tree.Connor Shea2016-06-013-0/+0
| | * | Fix teaspoonConnor Shea2016-06-013-3/+3
| | * | Fix indentationConnor Shea2016-06-011-6/+6
| | * | Attempt to fix the user page.Connor Shea2016-06-0110-2/+12
| | * | Remove d3 except for on pages where it's necessary.Connor Shea2016-06-0110-5/+26
| * | | Merge branch 'cleanup-readme' into 'master' Robert Speicher2016-06-021-2/+0
| |\ \ \ | | |/ / | |/| |
| | * | Remove Coveralls and Semaphore badges. [ci skip]cleanup-readmeConnor Shea2016-05-311-2/+0
| * | | Merge branch 'fix-dropdown-cutoff' into 'master' Robert Speicher2016-06-021-1/+1
| |\ \ \
| | * | | Add a title attribute to each branch in the branches dropdown on the New MR p...Connor Shea2016-05-311-1/+1
| * | | | Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-0210-31/+34
| |\ \ \ \
| | * | | | Fix a broken specConnor Shea2016-05-301-1/+1
| | * | | | Upgrade attr_encrypted and encryptorConnor Shea2016-05-307-9/+18
| | * | | | Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-305-21/+15
| * | | | | Merge branch 'downcase-registry-repository' into 'master' Stan Hu2016-06-013-3/+17
| |\ \ \ \ \
| | * | | | | Introduce container_registry_path_with_namespacedowncase-registry-repositoryKamil Trzcinski2016-06-012-17/+16
| | * | | | | Merge remote-tracking branch 'origin/master' into downcase-registry-repositoryKamil Trzcinski2016-06-013-4/+28
| | |\ \ \ \ \
| | * | | | | | Use downcased path to container repository as this is expected path by DockerKamil Trzcinski2016-06-013-3/+18
| * | | | | | | Merge branch '17187-hover-row' into 'master' Jacob Schatz2016-06-012-4/+12
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Implement new row hover styleAnnabel Dunstone2016-06-012-4/+12
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into categorize_sear...Fatih Acet2016-06-0112-24/+60
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '17676-merge-request-widget-alignment' into 'master' Jacob Schatz2016-06-011-1/+24
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix MR widget mobile stylingLuke "Jared" Bennett2016-05-311-1/+24
| * | | | | | Merge branch 'fix-note-validation-failure' into 'master' Stan Hu2016-06-012-3/+4
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix note validation spec failuresStan Hu2016-06-012-3/+4
| * | | | | | Merge branch 'add-edge-support' into 'master' Jacob Schatz2016-06-011-0/+1
| |\ \ \ \ \ \
| | * | | | | | Add Edge to supported browsers list. [ci skip]Connor Shea2016-06-011-0/+1
| * | | | | | | Merge branch 'dont-advertise-ci-skip' into 'master' Robert Speicher2016-06-011-4/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Don't advertise the use of "ci skip" in the CONTRIBUTING guidedont-advertise-ci-skipRémy Coutable2016-06-011-4/+2
| * | | | | | | Merge branch 'style/enable-semicolon-rubocop-cop' into 'master' Robert Speicher2016-06-013-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Enable Style/Semicolon rubocop style copstyle/enable-semicolon-rubocop-copGrzegorz Bizon2016-06-013-3/+3
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'rubocop/enable-style-for-cop' into 'master' Robert Speicher2016-06-012-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Enable Style/For rubocop coprubocop/enable-style-for-copGrzegorz Bizon2016-06-012-4/+4
| | |/ / / / / /
| * | | | | | | Merge branch 'dz-one-ci-cd-tab' into 'master' Dmitriy Zaporozhets2016-06-014-9/+22
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Merge Builds and Pipelines tab into onedz-one-ci-cd-tabDmitriy Zaporozhets2016-05-284-9/+22
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into categorize_sear...Fatih Acet2016-06-01143-720/+2526
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-0193-616/+2133
| |\ \ \ \ \ \
| | * | | | | | Refactor ParticipableYorick Peterse2016-06-0116-66/+491
| | * | | | | | Refactor MentionableYorick Peterse2016-05-261-10/+9
| | * | | | | | Added author to various Markdown calls in viewsYorick Peterse2016-05-2621-24/+24
| | * | | | | | Split Markdown rendering & reference gatheringYorick Peterse2016-05-2652-515/+1527
| | * | | | | | Added Gitlab::LazyYorick Peterse2016-05-262-0/+71