summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add Rspec test for "i" shortcutissue_14904Alfredo Sumaran2016-04-211-0/+21
* Remove spinach featuresAlfredo Sumaran2016-04-213-13/+0
* Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2199-3074/+1000
|\
| * 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
| * | | | | Merge branch 'revert-sentry-js' into 'master' Jacob Schatz2016-04-215-2482/+0
| |\ \ \ \ \
| | * | | | | Revert changelog tooJacob Schatz2016-04-211-1/+0
| | * | | | | Revert "Merge branch 'sentry-js' into 'master' "Jacob Schatz2016-04-214-2481/+0
| * | | | | | Merge branch 'top-navigation-concept' into 'master' Dmitriy Zaporozhets2016-04-2116-24/+30
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Layout navigation should respect layout width settingstop-navigation-conceptDmitriy Zaporozhets2016-04-202-9/+2
| | * | | | | Fix tests and remove countersDmitriy Zaporozhets2016-04-192-2/+4
| | * | | | | Implement top navigation concept for profile areaDmitriy Zaporozhets2016-04-1916-22/+33
| * | | | | | Merge branch 'document-feature-freeze' into 'master' Douwe Maan2016-04-211-0/+19
| |\ \ \ \ \ \
| | * | | | | | Document the feature freeze of stable branchesdocument-feature-freezeYorick Peterse2016-04-181-0/+19
| * | | | | | | Merge branch 'issue_5838' into 'master' Rémy Coutable2016-04-218-16/+37
| |\ \ \ \ \ \ \
| | * | | | | | | Add changelog entry and fix convention in a specissue_5838Felipe Artur2016-04-202-1/+2
| | * | | | | | | Remove unused authorization from controllerFelipe Artur2016-04-203-8/+2
| | * | | | | | | Projects members tab should follow visibility levelsFelipe Artur2016-04-185-39/+19
| | * | | | | | | Show project members only for membersFelipe Artur2016-04-185-3/+49
| * | | | | | | | Merge branch 'add-pg-trgrm-in-migration' into 'master' Yorick Peterse2016-04-211-0/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Attempt to create pg_trgm extension in migration for test/dev environmentsStan Hu2016-04-201-0/+11
| * | | | | | | | | Merge branch 'fix/cross-project-labels-project-reference' into 'master' Grzegorz Bizon2016-04-213-31/+48
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Refactor banzai code that finds cross-project labelsGrzegorz Bizon2016-04-211-15/+21
| | * | | | | | | | | Add Changelog entry for cross-project label fixGrzegorz Bizon2016-04-211-0/+1
| | * | | | | | | | | Fix cross-project label ref with invalid projectGrzegorz Bizon2016-04-212-17/+27
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'addtap' into 'master' Kamil Trzciński2016-04-211-0/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | add tap coverage example to project settingsEvan Lucas2016-04-191-0/+3
| * | | | | | | | | | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-2153-473/+646
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipelineKamil Trzcinski2016-04-19122-523/+1840
| | |\ \ \ \ \ \ \ \ \