summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert splitting group into "Activity" / "Projects" in the group nav baradd-filter-sort-dropdown-to-dashboard-group-pagesRémy Coutable2016-01-302-8/+3
* Merge remote-tracking branch 'origin/master' into add-filter-sort-dropdown-to...Rémy Coutable2016-01-29257-1839/+12822
|\
| * Merge branch 'note-background-job' into 'master' Dmitriy Zaporozhets2016-01-296-21/+72
| |\
| | * Fix Rubocop errornote-background-jobJosh Frye2016-01-281-3/+3
| | * Update testsJosh Frye2016-01-282-3/+27
| | * [WIP] Background process note logic for #3948Josh Frye2016-01-284-18/+45
| * | Merge branch 'rs-remove-ip-blocking' into 'master' Dmitriy Zaporozhets2016-01-2910-235/+8
| |\ \
| | * | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-2810-235/+8
| * | | Merge branch 'rs-transient-capybara-timeout' into 'master' Dmitriy Zaporozhets2016-01-293-5/+26
| |\ \ \
| | * | | Prevent transient Capybara timeouts during feature testsrs-transient-capybara-timeoutRobert Speicher2016-01-283-5/+26
| | |/ /
| * | | Merge branch 'rs-revert-revert-remove-coffee-filters' into 'master' Dmitriy Zaporozhets2016-01-291-0/+6
| |\ \ \
| | * | | Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""rs-revert-revert-remove-coffee-filtersRobert Speicher2016-01-281-0/+6
| * | | | Merge branch 'hotfix/ruby-21-broken-update' into 'master' Marin Jankovski2016-01-293-8/+8
| |\ \ \ \
| | * | | | add back master only for ruby 2.1 imagesJames Lopez2016-01-281-6/+4
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into hotfix/ruby-21-...James Lopez2016-01-2840-313/+569
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | trick rubocop and temporarily add ruby 2.1 images for any branchJames Lopez2016-01-284-12/+14
| * | | | | Make changes in config/initializers/1_settings.rbSytse Sijbrandij2016-01-281-0/+1
| | |_|_|/ | |/| | |
| * | | | Merge branch 'mr-merge-base' into 'master' Robert Speicher2016-01-287-22/+24
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into mr-merge-basemr-merge-baseDouwe Maan2016-01-2845-95/+147
| | |\ \ \ \
| | * | | | | Fix specsDouwe Maan2016-01-284-4/+7
| | * | | | | Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-275-22/+19
| * | | | | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-286-43/+84
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Fix changeloghighlight-blameDouwe Maan2016-01-281-3/+1
| | * | | | | Merge branch 'master' into highlight-blameDouwe Maan2016-01-2845-95/+147
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Move blame group logic to dedicated classDouwe Maan2016-01-285-43/+81
| | * | | | | Fix highlighting in blame view.Douwe Maan2016-01-273-4/+7
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'rs-ldap-user' into 'master' Robert Speicher2016-01-281-7/+8
| |\ \ \ \ \
| | * | | | | Backport LDAP user assignment changes from EERobert Speicher2016-01-281-7/+8
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'update_sentry_gem' into 'master' Robert Speicher2016-01-281-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Update sentry-raven gem.update_sentry_gemMarin Jankovski2016-01-281-1/+1
| | |/ / /
| * | | | Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-2818-22/+205
| |\ \ \ \
| | * | | | Align filter dropdown.issue_2406Rubén Dávila2016-01-271-0/+4
| | * | | | Remove no longer required CSS rule.Rubén Dávila2016-01-201-4/+0
| | * | | | Refactor some CSS rules.Rubén Dávila2016-01-202-6/+17
| | * | | | Some fixes from last code review.Rubén Dávila2016-01-204-5/+5
| | * | | | Some CSS and sorting fixes.Rubén Dávila2016-01-203-19/+30
| | * | | | Fix broken spec.Rubén Dávila2016-01-201-1/+3
| | * | | | Add specs for Forks listing.Rubén Dávila2016-01-202-0/+40
| | * | | | Add icon for private forks notice. #2406Rubén Dávila2016-01-203-2/+16
| | * | | | Add ability to sort forks. #2406Rubén Dávila2016-01-202-4/+7
| | * | | | aligns menu at top on one rowJacob Schatz2016-01-202-10/+26
| | * | | | changing projects cssJacob Schatz2016-01-201-1/+0
| | * | | | WIP: Add sort dropdown. #2406Rubén Dávila2016-01-201-0/+20
| | * | | | Little update to copy and custom content for empty results. #2406Rubén Dávila2016-01-201-8/+13
| | * | | | Show last commit as description. #2406Rubén Dávila2016-01-203-4/+10
| | * | | | Fix broken specs. #2406Rubén Dávila2016-01-202-6/+4
| | * | | | Add ability to filter by namespace. #2406Rubén Dávila2016-01-202-12/+20
| | * | | | Use adequate icon for Forks link on sidebar. #2406Rubén Dávila2016-01-201-1/+1
| | * | | | Show forks counter on listing. #2406Rubén Dávila2016-01-203-2/+10
| | * | | | Add fork button and implement ability to distinguish between public and prote...Rubén Dávila2016-01-202-2/+26