summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fewer html_safesrename-inline-diffDouwe Maan2016-01-301-2/+2
|
* Fix specs and add a new oneDouwe Maan2016-01-302-28/+37
|
* Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-2912-75/+194
|
* 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" This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact. See merge request !2643
| * Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-2810-235/+8
| | | | | | | | | | This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact.
* | Merge branch 'rs-transient-capybara-timeout' into 'master' Dmitriy Zaporozhets2016-01-293-5/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent transient Capybara timeouts during feature tests The problem occurred because asset compilation takes a long time, so when the asset cache didn't exist and the first test ran, it would often (randomly) time out during the generation before the actual test even had a chance to run. Now we check if the cache exists before the suite runs, and if not, we manually fire a request to the root URL in order to generate it. This should allow subsequent tests to use the cached assets. See merge request !2646
| * | Prevent transient Capybara timeouts during feature testsrs-transient-capybara-timeoutRobert Speicher2016-01-283-5/+26
| |/ | | | | | | | | | | | | | | | | | | | | The problem occurred because asset compilation takes a long time, so when the asset cache didn't exist and the first test ran, it would often (randomly) time out during the generation before the actual test even had a chance to run. Now we check if the cache exists before the suite runs, and if not, we manually fire a request to the root URL in order to generate it. This should allow subsequent tests to use the cached assets.
* | 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"" This reverts commit b0145d765b94d2cef86b10b6dd22895779cfef33. See merge request !2642
| * | Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""rs-revert-revert-remove-coffee-filtersRobert Speicher2016-01-281-0/+6
| | | | | | | | | | | | This reverts commit b0145d765b94d2cef86b10b6dd22895779cfef33.
* | | Merge branch 'hotfix/ruby-21-broken-update' into 'master' Marin Jankovski2016-01-293-8/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix syntax error on 2.1 and rubocop on 2.2 Background: Hashes `{:'key': 'value'}` are not valid in 2.1 but are recommended by Rubocop on 2.2. We only use those when we have a key such as `weird-key`, `weird.key`, etc... We could disable Rubocop but it wouldn't warn us about the recommended syntax since `Ruby 1.9`: `{key: 'value'}`, which is valid for `Ruby 1.9+`. Workaround 1 could be disabling `Style/HashSyntax:` in `rubocop.yml`. Workaround 2 (tried in this MR) is to trick Rubocop using `.to_sym` which is effectively the same as adding the `:`. This would allow to keep the warning in place. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12801 See merge request !2637
| * | | 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 ↵James Lopez2016-01-2840-313/+569
| |\ \ \ | | | | | | | | | | | | | | | hotfix/ruby-21-broken-update
| * | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly determine MR diff base when MR has merge conflicts Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779 See merge request !2632
| * \ \ \ 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 highlighting in blame view. See merge request !2630
| * | | | | 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 EE See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146 See merge request !2641
| * | | | | Backport LDAP user assignment changes from EERobert Speicher2016-01-281-7/+8
| | |_|/ / | |/| | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146
* | | | | Merge branch 'update_sentry_gem' into 'master' Robert Speicher2016-01-281-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update sentry-raven gem. Should resolve `fatal: Not a git repository (or any of the parent directories): .git` warnings. Fixes #12657 See merge request !2636
| * | | | Update sentry-raven gem.update_sentry_gemMarin Jankovski2016-01-281-1/+1
| |/ / /
* | | | Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-2818-22/+205
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376
| * | | | 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 ↵Rubén Dávila2016-01-202-2/+26
| | | | | | | | | | | | | | | | | | | | protected forks. #2406
| * | | | Use Project creator's avatar in fork listing. #2406Rubén Dávila2016-01-205-4/+12
| | | | |
| * | | | Setup new fork link in sidebar and routes. #2406Rubén Dávila2016-01-209-10/+20
| | | | |
* | | | | Merge branch 'issue_5546' into 'master' Dmitriy Zaporozhets2016-01-287-2/+111
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save list sort in a cookie Closes #5546 See merge request !2537
View Lorry Controller Status