| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffs | Jacob Vosmaer | 2016-03-03 | 1 | -0/+53 |
| |\ | |||||
| | * | Merge branch 'fix/deprecated-ci-badge-permissions' into 'master' | Douwe Maan | 2016-03-02 | 1 | -0/+53 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Fix permissions for deprecated CI build status badge This fixes permissions for deprecated status badge, being unavailable even if project is public. Closes #13324 See merge request !3030 | ||||
| | | * | Do not require authentication for CI status badgefix/deprecated-ci-badge-permissions | Grzegorz Bizon | 2016-03-01 | 1 | -12/+11 |
| | | | | | | | | | | | | | | | | This changes only deprecated CI badge that we keep for backwards compatibility. See !3030#note_4041498. | ||||
| | | * | Fix specs for deprecated CI build status badge | Grzegorz Bizon | 2016-03-01 | 1 | -1/+2 |
| | | | | |||||
| | | * | Fix deprecated CI build status badge permissions | Grzegorz Bizon | 2016-03-01 | 1 | -0/+53 |
| | | | | |||||
| * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffs | Jacob Vosmaer | 2016-03-01 | 4 | -3/+21 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-02-29 | 4 | -4/+4 |
| | |\ \ | | |/ | | | | | | | fix/contributions-forked-projects | ||||
| | | * | Add `:with_avatar` trait to User factory | Robert Speicher | 2016-02-24 | 3 | -3/+3 |
| | | | | |||||
| | * | | include contributions from forked projects on profile calendar | James Lopez | 2016-02-22 | 1 | -0/+18 |
| | | | | |||||
| * | | | Fixes caught by failing tests | Jacob Vosmaer | 2016-02-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffs | Jacob Vosmaer | 2016-02-25 | 12 | -10/+171 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge branch 'fix-autocomplete-spec' into 'master' | Robert Speicher | 2016-02-23 | 1 | -1/+1 |
| | |/ | | | | | | | | | | | | | | | Fix volatile spec. Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/312. See merge request !206 | ||||
| | * | Merge branch 'rs-move-controller-specs' into 'master' | Douwe Maan | 2016-02-20 | 5 | -0/+0 |
| | |\ | | | | | | | | | | | | | | | | | | | Move a few controller specs to their correct locations See merge request !2889 | ||||
| | | * | Move a few controller specs to their correct locationsrs-move-controller-specs | Robert Speicher | 2016-02-18 | 5 | -0/+0 |
| | | | | |||||
| | * | | Fix build and add specs | Rubén Dávila | 2016-02-19 | 1 | -0/+49 |
| | |/ | |||||
| | * | Reopened MRs should also be considered as open.issue_13539 | Rubén Dávila | 2016-02-17 | 1 | -0/+34 |
| | | | |||||
| | * | Merge branch 'git-archive-refactor' into 'master' | Douwe Maan | 2016-02-17 | 1 | -8/+3 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Refactor 'git archive' hand-off to gitlab-workhorse We have a nicer way now to hand off HTTP responses to gitlab-workhorse. Companion MR: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/36 See merge request !2675 | ||||
| | | * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵ | Jacob Vosmaer | 2016-02-17 | 4 | -1/+109 |
| | | |\ | | | | | | | | | | | | | git-archive-refactor | ||||
| | | * | | First version of "git archive" headers | Jacob Vosmaer | 2016-02-02 | 1 | -8/+3 |
| | | | | | |||||
| | * | | | Redirect /import to project page if no importing at all and repo existsfix/13367-redirect-to-project-page-if-no-import | Rémy Coutable | 2016-02-17 | 1 | -0/+12 |
| | | |/ | |/| | | | | | | | Fixes #13367. | ||||
| | * | | Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467 | Robert Speicher | 2016-02-15 | 1 | -0/+37 |
| | | | | | | | | | | | | | Closes #13467 | ||||
| | * | | Add spec for assigning view param from cookiekkm/gitlab-ce-user-diff-view-pref-cookie | Robert Speicher | 2016-02-05 | 1 | -5/+19 |
| | | | | |||||
| | * | | Add a controller test for the new 'diff_view' cookie | Rémy Coutable | 2016-02-05 | 1 | -1/+13 |
| | | | | |||||
| | * | | Merge branch 'fix/atom-url-issue' into 'master' | Douwe Maan | 2016-02-04 | 1 | -0/+8 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix atom url issue on projects This MR adds prevents a project to have a path ending in .atom that conflicts with the feed and Adds a migration to migrate old .atom projects to a different path Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699 See merge request !2651 | ||||
| | | * | | refactored migration and spec based on feedback | James Lopez | 2016-02-04 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | refactor previous test and add validation to project model | James Lopez | 2016-01-29 | 1 | -6/+3 |
| | | | | | |||||
| | | * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue | James Lopez | 2016-01-29 | 3 | -14/+132 |
| | | |\ \ | | | |/ | |||||
| | | * | | WIP - spec failure on .atom project URL | James Lopez | 2016-01-22 | 1 | -0/+11 |
| | | | | | |||||
| * | | | | Fix some specs | Jacob Vosmaer | 2016-02-04 | 2 | -4/+4 |
| |/ / / | |||||
| * | | | Fix rubocop offenses | Douglas Barbosa Alexandre | 2016-02-02 | 1 | -4/+1 |
| | | | | |||||
| * | | | Refactor Admin::SpamLogsController to block user before destroying | Douglas Barbosa Alexandre | 2016-02-02 | 1 | -21/+14 |
| | | | | |||||
| * | | | Support Akismet spam checking for creation of issues via API | Stan Hu | 2016-02-02 | 1 | -0/+47 |
| | |/ |/| | | | | | | | | | | | Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612 | ||||
| * | | Move blame group logic to dedicated class | Douwe Maan | 2016-01-28 | 1 | -14/+0 |
| | | | |||||
| * | | Merge branch 'rs-groups-index' into 'master' | Douwe Maan | 2016-01-26 | 1 | -0/+23 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the `/groups` route behave as expected The route is supposed to redirect the Groups#index request based on whether or not a user was logged in. If they are, we redirect them to their groups dashboard; if they're not, we redirect them to the public Explore page. But due to overly aggressive `before_action`s that weren't excluding (or including) the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660 See merge request !2580 | ||||
| | * | | Make the `/groups` route behave as expectedrs-groups-index | Robert Speicher | 2016-01-23 | 1 | -0/+23 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | The route is supposed to redirect the Groups#index request based on whether or not a user was logged in. If they are, we redirect them to their groups dashboard; if they're not, we redirect them to the public Explore page. But due to overly aggressive `before_action`s that weren't excluding the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660 | ||||
| * | | Fixi import redirect loop | Douglas Barbosa Alexandre | 2016-01-25 | 1 | -0/+109 |
| |/ | |||||
| * | Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' | Douwe Maan | 2016-01-14 | 1 | -0/+26 |
| |\ | | | | | | | | | | | | | | | | | | | | | Unsubscribe from thread through link in email footer Closes #3437   See merge request !2068 | ||||
| | * | Unsubscribe from thread through link in email footer | Zeger-Jan van de Weg | 2016-01-09 | 1 | -0/+26 |
| | | | |||||
| * | | Repair ldap_blocked state when no ldap identity exist anymore | Gabriel Mazetto | 2016-01-08 | 1 | -0/+26 |
| | | | |||||
| * | | Prevent ldap_blocked users from being unblocked by the Admin UI | Gabriel Mazetto | 2016-01-08 | 1 | -9/+26 |
| |/ | |||||
| * | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Jacob Vosmaer | 2016-01-07 | 1 | -0/+66 |
| | | |||||
| * | Add `AbuseReport#notify`rs-abuse-reports-refactor | Robert Speicher | 2016-01-04 | 1 | -55/+25 |
| | | | | | Tell, Don't Ask. | ||||
| * | Fix specs | Douwe Maan | 2015-12-18 | 1 | -2/+2 |
| | | |||||
| * | Automatically fork a project when not allowed to edit a file. | Douwe Maan | 2015-12-18 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'serve_lfs_object' into 'master' | Douwe Maan | 2015-12-08 | 1 | -0/+34 |
| |\ | | | | | | | | | | | | | Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976 | ||||
| | * | All for you rubocop. | Marin Jankovski | 2015-12-08 | 1 | -2/+2 |
| | | | |||||
| | * | Stub the calls to disk and check what send_file returns. | Marin Jankovski | 2015-12-08 | 1 | -1/+3 |
| | | | |||||
| | * | Fix specs caused by update of gitlab-test repo.serve_lfs_object | Marin Jankovski | 2015-12-08 | 1 | -1/+1 |
| | | | |||||
| | * | Add specs for showing lfs object in UI. | Marin Jankovski | 2015-12-07 | 1 | -0/+32 |
| | | | |||||
| * | | Merge branch 'master' into fix-merge-request-that-removes-submodule | Douglas Barbosa Alexandre | 2015-12-07 | 2 | -3/+29 |
| |\ \ | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |