summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Provide explicit html format when rendering git_not_found pagers-git_not_foundRobert Speicher2016-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, if the request format was, for example, .zip, we'd get an `ActionView::MissingTemplate` error.
* | | | | | | | Properly render the `errors/git_not_found` pageRobert Speicher2016-02-151-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'fix-me-me-me-me' into 'master' Valery Sizov2016-02-151-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji Steps to reproduce: 1. Go to a MR or issue 2. Click on "thumbsup" Emoji 3 times 3. Observe the tooltip becomes "me, me" Closes #13374, #12788 See merge request !2804
| * | | | | | | Fix duplicate "me" in tooltip of the "thumbsup" awards EmojiStan Hu2016-02-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Steps to reproduce: 1. Go to a MR or issue 2. Click on "thumbsup" Emoji 3 times 3. Observe the tooltip becomes "me, me" Closes #13374, #12788
* | | | | | | | Merge branch 'fix/ci-emails-broken-link' into 'master' Douwe Maan2016-02-133-8/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken link in CI build notification emails Closes #13199 See merge request !2785
| * | | | | | | | Fix broken link in CI build notification emailsGrzegorz Bizon2016-02-123-8/+10
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes #13199
* | | | | | | | Merge branch 'ben.boeckel/gitlab-ce-fixup-links-in-generic-docs' into 'master' Douwe Maan2016-02-132-2/+16
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix relative links in other markup formats _Originally opened at !1845 by @ben.boeckel._ - - - The RelativeLinkFilter was not applied to other document formats, e.g., reStructuredText, so links from the Files view or the Project view did not work. Fixes #3533. See merge request !2798
| * | | | | | | Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docsBen Boeckel2016-02-122-2/+16
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Apply the RelativeLinkFilter filter to other formats, e.g., reStructuredText so links from the Files view or the Project view work - Remove the AsciidocPipeline pipeline Fixes #3533.
* | | | | | | Merge branch 'fix-duplicate-hook-notifications' into 'master' Douwe Maan2016-02-122-10/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicated branch creation/deletion Web hooks/service notifications when using Web UI Similar to 423d2d6, except duplicates occurred only if a Web service (e.g. Slack) were configured. When deleting a branch, this is what was happening: 1. DeleteBranchService calls execute_hooks and execute_services 2. The call to repository.rm_branch triggers the GitHooksService. 3. This, in turn, calls GitPushService and then calls the same hooks/services again. 5145706 now makes it no longer necessary for DeleteBranchService and CreateBranchService to execute the branch hooks/services. Note that tags behave differently in GitTagPushService and GitPushService is not called. Closes #10330 See merge request !2763
| * | | | | | | Fix duplicated branch creation/deletion Web hooks/service notifications when ↵Stan Hu2016-02-092-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using Web UI Similar to 423d2d6, except duplicates occurred only if a Web service (e.g. Slack) were configured. When deleting a branch, this is what was happening: 1. DeleteBranchService calls execute_hooks and execute_services 2. The call to repository.rm_branch triggers the GitHooksService. 3. This, in turn, calls GitPushService and then calls the same hooks/services again. 5145706 now makes it no longer necessary for DeleteBranchService and CreateBranchService to execute the branch hooks/services. Note that tags behave differently in GitTagPushService and GitPushService is not called. Closes #10330
* | | | | | | | Merge branch 'fix_500-commit-null' into 'master' Douwe Maan2016-02-121-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to mark broken MR as mergable In case merge request is broken, we shouldn't check if the sha is mergable, as it will be null, and there's no point, as we know that it's not mergable. See merge request !2783
| * | | | | | | | Don't try to mark broken MR as mergableNemanja Boric2016-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case merge request is broken, we shouldn't check if the sha is mergable, as it will be null, and there's no point, as we know that it's not mergable.
* | | | | | | | | Merge branch 'rs-issue-merge-requests' into 'master' Douwe Maan2016-02-121-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct indentation for `issues/merge_requests` partial render Prior, it would only be shown if the issue had been edited. See merge request !2789
| * | | | | | | | Correct indentation for `issues/merge_requests` partial renderrs-issue-merge-requestsRobert Speicher2016-02-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, it would only be shown if the issue had been edited.
* | | | | | | | | Merge branch 'olirogers/gitlab-ce-project-milestone-order' into 'master' Douwe Maan2016-02-123-12/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix milestone order in project and issue edit lists to due_date _Originally opened at !2579 by @olirogers._ - - - This MR orders the milestones by due date (earliest first) in the project and edit issue view. These suggestions were made be @orih in #6001 and fixes #6001. This continues the work of !1934 to order milestones. I found this annoying when creating milestones, found #6001 but no attached MR. This is my first for this project - comments and criticisms welcome. See merge request !2780
| * | | | | | | | | Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-orderOliver Rogers2016-02-103-12/+9
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'streamline-email-validation' into 'master' Douwe Maan2016-02-125-23/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate email addresses using Devise.email_regexp Also: - Get rid of legacy `:strict_mode` - Get rid of custom `:email` validator - Add some shared examples to spec emails validation This supersedes !2754 and fixes #3851. See merge request !2771
| * | | | | | | | | Re-add EmailValidator to avoid the repetition of format: { with: ↵streamline-email-validationRémy Coutable2016-02-095-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Devise.email_regexp }
| * | | | | | | | | Validate email addresses using Devise.email_regexpRémy Coutable2016-02-095-28/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - Get rid of legacy :strict_mode - Get rid of custom :email validator - Add some shared examples to spec emails validation
* | | | | | | | | | Don't show fork button if user can't fork the project.issue_13369Rubén Dávila2016-02-111-8/+9
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Move builds badge implementation to new badges controllerGrzegorz Bizon2016-02-112-10/+11
| | | | | | | | |
* | | | | | | | | Inherit build badge access permissions from projectGrzegorz Bizon2016-02-111-10/+4
| | | | | | | | |
* | | | | | | | | Respond to proper format for build badge requestGrzegorz Bizon2016-02-111-2/+8
| | | | | | | | |
* | | | | | | | | Move badge implementation to builds controllerGrzegorz Bizon2016-02-112-16/+10
| | | | | | | | |
* | | | | | | | | Skip authentication when requesting commit status badgeGrzegorz Bizon2016-02-111-1/+7
| | | | | | | | |
* | | | | | | | | Improve CI status badge implementationGrzegorz Bizon2016-02-112-15/+9
| | | | | | | | |
* | | | | | | | | Add CI status badge implementation to commit controllerGrzegorz Bizon2016-02-111-0/+6
| | | | | | | | |
* | | | | | | | | Render 404 if there is no project for old CI status badgeGrzegorz Bizon2016-02-111-0/+1
| | | | | | | | |
* | | | | | | | | Add deprecation warning for old CI status badge actionGrzegorz Bizon2016-02-111-1/+4
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We keep this only for backwards compatibility with projects that have been migrated from GitLab CI. New project badge will go elsewhere.
* | | | | | | | Merge branch 'display-mr-link-if-thre-is-one' into 'master' Douglas Barbosa Alexandre2016-02-105-9/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces "Create merge request" link with one to the MR when one exists Fixes #3716 * Without MR: ![before-1](/uploads/abcb2eb5bb5927a83c2f1700528f852c/before-1.png) * With MR: ![after-1](/uploads/9020b871e1aa08d3e5a45359336ef0f2/after-1.png) * Without MR: ![before-2](/uploads/bb3bd1a74efc193ad31af68f1e04ef5f/before-2.png) * With MR: ![after-2](/uploads/789d32aef12f39c605e665d0c4bc9fbe/after-2.png) * Without MR: ![before-3](/uploads/a9aff7a11eb1069be24c37a5455be809/before-3.png) * With MR: ![after-3](/uploads/48fe81ea50657fe5b2de0d25260d8e4b/after-3.png) See merge request !2670
| * | | | | | | | Change MR link to "View Open Merge Request"display-mr-link-if-thre-is-oneDouglas Barbosa Alexandre2016-02-102-2/+2
| | | | | | | | |
| * | | | | | | | Replaces "Create merge request" link with one to the MR when one existsDouglas Barbosa Alexandre2016-02-105-9/+28
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'brammeleman/3047-add-assignee-data-to-isuable-hook-data' into ↵Robert Speicher2016-02-101-1/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add assignee data to Issuables' hook_data Originally opened at !1633 by @brammeleman. Fixes #3047. Fixes #2475. See merge request !2724
| * | | | | | | Add assignee data to Issuables' hook_databrammeleman/3047-add-assignee-data-to-isuable-hook-dataBram Daams2016-02-101-1/+4
| | | | | | | |
* | | | | | | | Merge branch 'cwq1913/gitlab-ce-fix_skip_merge_commits' into 'master' Robert Speicher2016-02-101-1/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually use the `skip_merges` option in Repository#commits Originally opened at !2067 by @cwq1913. See merge request !2750
| * | | | | | | Actually use the `skip_merges` option in Repository#commitscwq1913/gitlab-ce-fix_skip_merge_commitsTony Chu2016-02-081-1/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix-explore-filter' into 'master' Dmitriy Zaporozhets2016-02-1013-50/+90
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ajax filtering to all paged project lists. Fixes #13182 See merge request !2728
| * | | | | | Cleanup to use one selectorfix-explore-filterJosh Frye2016-02-095-8/+8
| | | | | | |
| * | | | | | More specific selectorsJosh Frye2016-02-091-4/+4
| | | | | | |
| * | | | | | MR feedbackJosh Frye2016-02-095-12/+9
| | | | | | |
| * | | | | | Extract events rendering to own action.Josh Frye2016-02-095-17/+21
| | | | | | |
| * | | | | | Starred, All, and Trending on explore are paged also group projects. Need ↵Josh Frye2016-02-097-14/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ajax filter.
| * | | | | | JS FixesJosh Frye2016-02-092-14/+15
| | | | | | |
| * | | | | | Fix explore filter. Fixes #13182Josh Frye2016-02-093-24/+21
| | |_|/ / / | |/| | | |
* | | | | | Ensure link for README blobs includes the full pathrs-issue-13254Robert Speicher2016-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Closes #13254
* | | | | | Merge branch 'variables-build-log' into 'master' Robert Speicher2016-02-091-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notice about variables in build log Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 [ci skip] See merge request !2761
| * | | | | | Add information about expose of build variables.variables-build-logKamil Trzcinski2016-02-091-1/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix-logo-rasterization' into 'master' Robert Speicher2016-02-092-21/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent rasterization artifacts in the logo, and simplify markup. - Remove sketch-namespaced attributes. - Remove unused groups, and cancel out unnecessary transforms. - Use overlap to avoid rasterization artifacts in the logo. - Remove viewBox parameter and define paths in their final form. See merge request !2741
| * | | | | | Prevent rasterization artefacts in the logo, and simplify markup.Aaron Hamilton2016-02-082-21/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove sketch-namespaced attributes. - Remove unused groups, and cancel out unnecessary transforms. - Use overlap to avoid rasterization artefacts in the logo. - Extend comment for `#logo` click event handler, as it's a non-obvious hack for Safari. - Remove viewBox parameter and define paths in their final form.
* | | | | | Merge branch 'smarter-diverging-commit-cache-flushing' into 'master' Douwe Maan2016-02-092-13/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smarter flushing of branch statistics caches This basically ensures we only flush caches of branches whenever we really have to. See commit c514f8b850219cd3e5526e73e1d00e6729e2b466 for the details. cc @joshfng @rspeicher See merge request !2769