Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use Ghost user when edited_by, merged_by deleted34930-fix-edited-by | Jarka Kadlecova | 2017-07-19 | 1 | -0/+20 |
| | |||||
* | Merge branch 'fixes-for-internal-auth-disabled' into 'master' | Sean McGivern | 2017-07-14 | 2 | -3/+3 |
|\ | | | | | | | | | Fixes needed when GitLab sign-in is not enabled See merge request !12491 | ||||
| * | Fixes needed when GitLab sign-in is not enabled | Robin Bobbitt | 2017-07-13 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | When sign-in is disabled: - skip password expiration checks - prevent password reset requests - don’t show Password tab in User Settings - don’t allow login with username/password for Git over HTTP requests - render 404 on requests to Profiles::PasswordsController | ||||
* | | Merge branch 'sh-fix-award-emoji-spec' into 'master' | Rémy Coutable | 2017-07-11 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id` Closes gitlab-ee#2890 See merge request !12770 | ||||
| * | | Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id`sh-fix-award-emoji-spec | Stan Hu | 2017-07-10 | 1 | -2/+2 |
| |/ | | | | | | | Closes gitlab-org/gitlab-ee#2890 | ||||
* | | Support multiple Redis instances based on queue type | Paul Charlton | 2017-07-11 | 2 | -2/+2 |
|/ | |||||
* | Resolve "Inconsistent location of members page between groups and projects" | Tim Zallmann | 2017-07-07 | 1 | -6/+0 |
| | |||||
* | Create and use project path helpers that only need a project, no namespace | Douwe Maan | 2017-07-05 | 6 | -23/+23 |
| | |||||
* | Use stub_application_setting when testing ApplicationHelper#support_url34648-use-stub_application_setting-to-test-support_url | Rémy Coutable | 2017-07-04 | 1 | -1/+1 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch '34116-milestone-filtering-on-group-issues' into 'master' | Sean McGivern | 2017-07-03 | 1 | -0/+36 |
|\ | | | | | | | | | | | | | Use correct milestones for filtering on Group Issues Closes #34116 See merge request !12374 | ||||
| * | Add tests for MilestonesHelper#milestones_filter_dropdown_path | Takuya Noguchi | 2017-06-26 | 1 | -0/+36 |
| | | |||||
* | | New navigation breadcrumbs | Phil Hughes | 2017-06-30 | 1 | -1/+1 |
| | | |||||
* | | Make finders responsible for counter cache keys | Sean McGivern | 2017-06-30 | 1 | -24/+22 |
| | | |||||
* | | Cache total issue / MR counts for project by user type | Sean McGivern | 2017-06-30 | 1 | -6/+43 |
| | | | | | | | | | | | | This runs a slightly slower query to get the issue and MR counts in the navigation, but caches by user type (can see all / none confidential issues) for two minutes. | ||||
* | | Strip trailing whitespace in relative submodule URLdm-relative-submodule-url-trailing-whitespace | Douwe Maan | 2017-06-28 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'pat-alert-when-signin-disabled' into 'master' | Rémy Coutable | 2017-06-27 | 2 | -0/+141 |
|\ \ | | | | | | | | | | | | | Provide hint to create a personal access token for Git over HTTP See merge request !12105 | ||||
| * | | Provide hint to create a personal access token for Git over HTTP | Robin Bobbitt | 2017-06-26 | 2 | -0/+141 |
| |/ | | | | | | | | | | | If internal auth is disabled and user is not an LDAP user, present the user with an alert to create a personal access token if he does not have one already. | ||||
* | | Tag a spec as :nested_groups since it fails on MySQLfix-nested-group-spec-on-mysql | Rémy Coutable | 2017-06-26 | 1 | -1/+1 |
|/ | | | | | | | This was broken by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12322. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Fix breadcrumb order | Michael Kozono | 2017-06-22 | 1 | -0/+13 |
| | |||||
* | Enable Style/DotPosition Rubocop :cop: | Grzegorz Bizon | 2017-06-21 | 13 | -92/+92 |
| | |||||
* | Fix avatar images in pipeline emailsfix-email-avatars | Sean McGivern | 2017-06-20 | 1 | -31/+60 |
| | |||||
* | Don't display comment on unchanged line on both sides in parallel diff | Douwe Maan | 2017-06-19 | 1 | -1/+10 |
| | |||||
* | Merge branch '23998-blame-age-map' into 'master' | Annabel Dunstone Gray | 2017-06-15 | 1 | -0/+59 |
|\ | | | | | | | | | | | | | Add age color mapping to blame view Closes #23998 See merge request !7198 | ||||
| * | Add blame view age map | Jeff Stubler | 2017-06-14 | 1 | -0/+59 |
| | | |||||
* | | Correct RSpec/SingleLineHook cop offenses | Robert Speicher | 2017-06-14 | 2 | -2/+7 |
| | | |||||
* | | Merge branch 'help-landing-page-customizations' into 'master' | Douwe Maan | 2017-06-14 | 1 | -0/+17 |
|\ \ | | | | | | | | | | | | | Allow more customization to Help landing page See merge request !11878 | ||||
| * | | Help landing page customizations | Robin Bobbitt | 2017-06-14 | 1 | -0/+17 |
| |/ | |||||
* | | Implement diff viewers | Douwe Maan | 2017-06-14 | 1 | -1/+38 |
| | | |||||
* | | Update tests and applicationfix-external-ci-services | Kamil Trzcinski | 2017-06-13 | 1 | -0/+33 |
|/ | |||||
* | Merge branch 'operau2f' into 'master' | Rémy Coutable | 2017-06-12 | 1 | -0/+49 |
|\ | | | | | | | | | Fix FIDO U2F for Opera browser (based on !10118) See merge request !12082 | ||||
| * | Add test for u2f helper and changelog entry | Jonas Kalderstam | 2017-06-11 | 1 | -0/+49 |
| | | |||||
* | | Test todos_count_format helper at the correct level to improve speedrs-simplify-todo-count-spec | Robert Speicher | 2017-06-09 | 1 | -0/+13 |
|/ | | | | | Instead of an integration test that creates 101 Todo records to test a simple view helper, just unit test the helper. | ||||
* | Bring in security changes from the 9.2.5 release | DJ Mountney | 2017-06-07 | 4 | -9/+10 |
| | | | | | | | | | | | | | Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue | ||||
* | Translate project & repository pages | Bob Van Landuyt | 2017-06-07 | 1 | -0/+6 |
| | |||||
* | Added more actions and report as abuse to all notes | Luke "Jared" Bennett | 2017-06-07 | 1 | -0/+10 |
| | |||||
* | Sync email address from specified omniauth provider | Robin Bobbitt | 2017-06-07 | 1 | -0/+36 |
| | |||||
* | Resolve "When changing project visibility setting, change other dropdowns ↵ | Mike Greiling | 2017-06-06 | 2 | -3/+3 |
| | | | | automatically" | ||||
* | Merge branch 'dz-fix-submodule-subgroup' into 'master' | Douwe Maan | 2017-06-05 | 1 | -0/+8 |
|\ | | | | | | | | | | | | | Fix submodule link to then project under subgroup Closes gitlab-ee#2411 See merge request !11906 | ||||
| * | Fix submodule link to then project under subgroup | Dmitriy Zaporozhets | 2017-06-05 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | Before this change only last namespace in full path was extracted. It's fine unless you have a link to submodule under subgroups. In that case self_url? method returns false and link is processed as external. I could not find a proper regex to cover all cases and correctly extract full path to repository and instead used current instance host name to get correct path to namespace and project. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into ↵ | Luke "Jared" Bennett | 2017-06-02 | 4 | -47/+148 |
|\ \ | |/ | | | | | fix-realtime-edited-text-for-issues-9-3 | ||||
| * | Show current user immediately in issuable filters | Winnie Hellmann | 2017-06-02 | 1 | -0/+101 |
| | | |||||
| * | Merge branch 'fix_diff_line_comments' into 'master' | Sean McGivern | 2017-06-01 | 1 | -0/+27 |
| |\ | | | | | | | | | | | | | | | | | | | Fix: A diff comment on a change at last line of a file shows as two comments in discussion Closes #32353 See merge request !11802 | ||||
| | * | Fix rubocop in spec/helpers/diff_helper_spec.rb | Valery Sizov | 2017-06-01 | 1 | -6/+7 |
| | | | |||||
| | * | Fix: A diff comment on a change at last line of a file shows as two comments ↵ | Valery Sizov | 2017-05-31 | 1 | -0/+26 |
| | | | | | | | | | | | | in discussion | ||||
| * | | Fix Diff#too_large? and specs | Douwe Maan | 2017-05-30 | 1 | -11/+9 |
| | | | |||||
| * | | Consistent diff and blob size limit names | Douwe Maan | 2017-05-29 | 2 | -11/+11 |
| |/ | |||||
* | | Removed unneeded newline in issuables_helper_spec and removed unneeded ↵ | Luke "Jared" Bennett | 2017-06-02 | 1 | -1/+0 |
| | | | | | | | | updated_at_by variable in issuable_app_data | ||||
* | | Fixed issuables_helper_spec and added a test for issuable_app_data | Luke "Jared" Bennett | 2017-05-31 | 1 | -0/+26 |
| | | |||||
* | | Remove EditableHelper and move method to IssuablesHelper | Luke "Jared" Bennett | 2017-05-31 | 2 | -21/+18 |
| | | |||||
* | | Correct editable_helper spec and format issuable_app_data updated_at to iso8061 | Luke "Jared" Bennett | 2017-05-31 | 1 | -2/+2 |
| | |