summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't break line in middle of wordword-breakAnnabel Dunstone2016-04-213-1/+6
* Merge branch 'doc-updating-gitlab' into 'master' Achilleas Pipinellis2016-04-212-8/+167
|\
| * Split into sections, port `downgrade_ee_to_ce` doc from EEdoc-updating-gitlabAchilleas Pipinellis2016-04-212-8/+164
| * Fix links in update READMEAchilleas Pipinellis2016-04-191-5/+8
* | Merge branch 'test-db-migrate' into 'master' Stan Hu2016-04-211-0/+5
|\ \
| * | Add db:migrate task to CIDmitriy Zaporozhets2016-04-211-0/+5
* | | Merge branch 'instrument-gitlab-access' into 'master' Rémy Coutable2016-04-212-0/+5
|\ \ \ | |/ / |/| |
| * | Instrument Gitlab::GitAccess/GitAccessWikiYorick Peterse2016-04-212-0/+5
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceRémy Coutable2016-04-219-99/+155
|\ \ \
| * \ \ Merge branch 'label-dropdown-fix' into 'master' Jacob Schatz2016-04-219-99/+155
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/master' into label-dropdown-fixlabel-dropdown-fixAlfredo Sumaran2016-04-2058-191/+3448
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into label-dropdown-fixAlfredo Sumaran2016-04-202-15/+12
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/master' into label-dropdown-fixAlfredo Sumaran2016-04-20267-1053/+4251
| | |\ \ \ \ \
| | * | | | | | Move shared html to a partialAlfredo Sumaran2016-04-183-34/+21
| | * | | | | | Add is-link attribute to know if a menu item should not be stoppedAlfredo Sumaran2016-04-182-2/+2
| | * | | | | | Remove $parentAlfredo Sumaran2016-04-181-6/+5
| | * | | | | | Add tests to check if a new label is addedAlfredo Sumaran2016-04-151-0/+79
| | * | | | | | Fix create label functionalityAlfredo Sumaran2016-04-151-41/+25
| | * | | | | | Fix Label dropdown and organize codeAlfredo Sumaran2016-04-155-6/+13
| | * | | | | | Render proper partialAlfredo Sumaran2016-04-152-2/+2
| | * | | | | | Add spacesAlfredo Sumaran2016-04-151-3/+3
| | * | | | | | Reuse partial for Create Label pageAlfredo Sumaran2016-04-153-18/+21
| | * | | | | | Restore broken codeAlfredo Sumaran2016-04-151-9/+6
* | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-04-212-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'issue_15434' into 'master' Jacob Schatz2016-04-212-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Remove unnecessary provided paramAlfredo Sumaran2016-04-211-1/+1
| | * | | | | | | Remove unused paramAlfredo Sumaran2016-04-211-1/+1
* | | | | | | | | Merge branch 'rs-issue-15408' into 'master' Robert Speicher2016-04-211-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix undefined local variable error in Invalid MR templaters-issue-15408Robert Speicher2016-04-211-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'diff-link-fix' into 'master' Jacob Schatz2016-04-212-10/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Put back removed line numberdiff-link-fixPhil Hughes2016-04-201-1/+1
| * | | | | | | | Fixed issue when scrolling to element and there is an expanderPhil Hughes2016-04-201-2/+2
| * | | | | | | | Fixed issue with lines not being selectable when expanding diffPhil Hughes2016-04-201-5/+5
| * | | | | | | | Fixed issue with incorrect line being highlighted if line is in discussion viewPhil Hughes2016-04-201-4/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '15445-file-renames' into 'master' Jacob Schatz2016-04-211-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | File name change appears on one lineAnnabel Dunstone2016-04-211-0/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'note-username-text-color' into 'master' Jacob Schatz2016-04-211-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed issue with author link color on dark diffsnote-username-text-colorPhil Hughes2016-04-211-0/+3
* | | | | | | | | Merge branch 'sidekiq-memory-sigterm' into 'master' Stan Hu2016-04-211-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Use SIGTERM during Sidekiq memory shutdownJacob Vosmaer2016-04-211-2/+2
* | | | | | | | | Merge branch 'fix/label-filters' into 'master' Douwe Maan2016-04-214-31/+62
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | refactored specs based on feedbackfix/label-filtersJames Lopez2016-04-212-31/+18
| * | | | | | | | use wait_for_ajax instead of sleeping for 2 days!James Lopez2016-04-211-10/+12
| * | | | | | | | refactored specs, adding more scenariosJames Lopez2016-04-212-22/+34
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filtersJames Lopez2016-04-21218-725/+5866
| |\ \ \ \ \ \ \ \
| * | | | | | | | | final line missingJames Lopez2016-04-201-1/+1
| * | | | | | | | | fix rubocop warningJames Lopez2016-04-201-2/+2
| * | | | | | | | | udpated a few things based on MR feedback. Also added model specJames Lopez2016-04-205-176/+203
| * | | | | | | | | fix other spec failuresJames Lopez2016-04-191-1/+1
| * | | | | | | | | filter labels by including all filter titles as part of the queryJames Lopez2016-04-193-2/+172