summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Sort projects by last activity for new issue dropdownnew-issue-projects-sortDmitriy Zaporozhets2016-02-041-1/+1
| | | | | | | When creating new issue from dashboard page I want to see projects sorted by last activity instead of ID Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rs-whitelist-in-pipeline' into 'master' Douwe Maan2016-02-044-31/+50
|\ | | | | | | | | | | | | | | Make Pipelines responsible for defining their custom whitelist This allows for future pipelines to more easily define a custom whitelist. See merge request !2693
| * Make Pipelines responsible for defining their custom whitelistrs-whitelist-in-pipelineRobert Speicher2016-02-034-31/+50
| | | | | | | | | | This allows for future pipelines to more easily define a custom whitelist.
* | Merge branch 'wipMergeSpacing' into 'master' Douwe Maan2016-02-043-1/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | No space required after WIP identifier Fixes #2426 Currently, the WIP: (or any other variation) prefix of a merge request title must include a trailing space for it to be recognized as a work in progress and prevent merging. To resolve this, I added an or pattern to the regexp to look for any one of the three possible delimiters ':', ']', or ' '. This way the trailing space isn't required but it still won't mark any titles beginning with wip as work in progress (e.g. "Wipwap"). See merge request !1876
| * | Removed redundent and incorrect tests on WIPTed Hogan2016-01-061-10/+0
| | |
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into wipMergeSpacingTed Hogan2015-12-291236-13436/+37376
| |\ \
| * | | No space required after WIP identifierTed Hogan2015-11-233-1/+17
| | | | | | | | | | | | | | | | Modified changelog
* | | | Merge branch 'sort-projects-dropdown' into 'master' Dmitriy Zaporozhets2016-02-043-3/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort projects by last activity for project switcher in header Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #13172 See merge request !2692
| * | | | Satisfy rubocopDmitriy Zaporozhets2016-02-041-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Sort projects by last activity for project switcher in headersort-projects-dropdownDmitriy Zaporozhets2016-02-033-3/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'use-top-area' into 'master' Dmitriy Zaporozhets2016-02-0310-62/+83
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Use top-area component for top page navigation for pages that contains list of items Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2686
| * | | | Merge branch 'master' into use-top-areaDmitriy Zaporozhets2016-02-0320-59/+53
| |\ \ \ \ | |/ / / / |/| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'dashboard-sort-dropdown' into 'master' Dmitriy Zaporozhets2016-02-0311-38/+40
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sort dropdown to dashboard projects page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> First step to improve projects page. Related to !2568 and #3968 See merge request !2691
| * | | | Add sort dropdown to dashboard projects pagedashboard-sort-dropdownDmitriy Zaporozhets2016-02-0311-38/+40
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'attach-file-cursor-position' into 'master' Jacob Schatz2016-02-031-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the markdown link at the cursor poisition When writing a comment and then dropping an image it will correctly add the image markdown link at the cursor position ![drop-image-markdown](/uploads/52f41e38faca48c9ee01a02a75ec71be/drop-image-markdown.gif) Tested in Chrome & Firefox and both working fine :thumbsup: Fixes #12822 cc. @jschatz1 See merge request !2648
| * | | | | Keeps cursor at the correct place after changing text in dropzonePhil Hughes2016-01-291-7/+2
| | | | | |
| * | | | | Adds the markdown link at the cursor poisitionPhil Hughes2016-01-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When writing a comment and then dropping an image it will correctly add the image markdown link at the cursor position Fixes #12822
* | | | | | Merge branch 'remove-useless-text-tips' into 'master' Jacob Schatz2016-02-034-12/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove useless text tips on commonly used pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2687
| * | | | | | Remove useless text tips on commonly used pagesDmitriy Zaporozhets2016-02-034-12/+0
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'ui-fixes' into 'master' Jacob Schatz2016-02-032-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing space between fork and star icons Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2685
| * | | | | | Fix missing space between fork and star iconsui-fixesDmitriy Zaporozhets2016-02-032-2/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'omniauth-saml-update' into 'master' Robert Speicher2016-02-032-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Updated omniuath-saml to the latest version. See merge request !2684
| * | | | | Updated omniuath-saml to the latest version.omniauth-saml-updatePatricio Cano2016-02-032-5/+5
| | | | | |
| | | * | | Update test after changes build page cssDmitriy Zaporozhets2016-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * | | Fix testsuse-top-areaDmitriy Zaporozhets2016-02-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * | | Use top-area component for top page navigation for pages that contains list ↵Dmitriy Zaporozhets2016-02-038-57/+78
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | of items Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'improve-groups-list' into 'master' Jacob Schatz2016-02-0311-160/+180
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve UI consistency between projects and groups lists * add group description to the list * move new group button to top nav * move projects/users count icons to the right Fixes #3939 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2677
| * | | | Use right margin for componened other than button for top navDmitriy Zaporozhets2016-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Tried to align form input vertically with other elements for top navDmitriy Zaporozhets2016-02-032-6/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Make nav-controls responsive and hide on extra small screensDmitriy Zaporozhets2016-02-032-16/+42
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor nav controls section (search and new project/group btn)Dmitriy Zaporozhets2016-02-037-140/+107
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add number_with_delimiter and remove unnecessary dara placement for groups pageDmitriy Zaporozhets2016-02-032-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Improve UI consistency between projects and groups listsDmitriy Zaporozhets2016-02-035-20/+49
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'stanhu/gitlab-ce-support-token-retrieval-by-headers' into ↵Dmitriy Zaporozhets2016-02-032-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Support download access by PRIVATE-TOKEN header Originally opened at !2522. Currently there is no way to download a raw file without embedding the token in the URL, which exposes the token in the URL. There should be an way of sending this information via the header as the API does. Closes https://github.com/gitlabhq/gitlabhq/issues/8137 See merge request !2683
| * | | | Support download access by PRIVATE-TOKEN headerStan Hu2016-02-032-0/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there is no way to download a raw file without embedding the token in the URL, which exposes the token in the URL. There should be an way of sending this information via the header as the API does. Closes https://github.com/gitlabhq/gitlabhq/issues/8137
* | | | Merge branch 'fix-build-artifacts-doc' into 'master' Achilleas Pipinellis2016-02-031-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup artifacts section in Docs - Added Note that artifact collection is only done for successful builds. - Cleaned up Windows Support and Version notes. See merge request !2619
| * | | | Documentation cleanup of artifacts section in Gitlab CI ReadmeMalte Blättermann2016-02-021-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added notice about build artifacts not beeing collected on failed builds. - Removed "introduced in 0.7.0" for artifacts section. - Made windows notice more precise
* | | | | Merge branch 'improve-environment-variables-doc' into 'master' Rémy Coutable2016-02-032-39/+52
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improving the "Environment variables" administration doc Closes #12829. /cc @sytses See merge request !2669
| * | | | | Unicorn worker killer is not Omnibus specificAchilleas Pipinellis2016-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Clean up environment variables docAchilleas Pipinellis2016-02-031-30/+35
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Improving the "Environment variables" administration docimprove-environment-variables-docRémy Coutable2016-02-012-32/+40
| | | | | |
* | | | | | Merge branch 'update_doc' into 'master' Achilleas Pipinellis2016-02-036-22/+67
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update OAuth doc See merge request !2589
| * | | | | | Refactor OAuth provider documentationupdate_docAchilleas Pipinellis2016-02-036-22/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | update OAuth docValery Sizov2016-01-251-1/+1
| | | | | | |
* | | | | | | Merge branch 'aral/gitlab-ce-master' into 'master' Achilleas Pipinellis2016-02-031-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added note: working copy changes should be stashed before update process Originally proposed by @aral in !1043. Added note: working copy changes (e.g., deleted vendor folder) should be stashed before beginning the update process. We should probably include this notice on all update guides. See merge request !2668
| * | | | | | | Added note: working copy changes (e.g., deleted vendor folder) should be ↵aral/gitlab-ce-masterAral Balkan2016-02-011-0/+6
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stashed before beginning the update process. We should probably include this notice on all update guides. [ci skip]
* | | | | | | Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-0334-7/+460
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support Akismet spam checking for creation of issues via API Currently any spam detected by Akismet for non-members via API will be logged in a separate table in the admin page. Closes #5612 See merge request !2266
| * | | | | | | Update CHANGELOGsupport-akismetDouglas Barbosa Alexandre2016-02-021-1/+1
| | | | | | | |
| * | | | | | | Hide the link for spam logs if the Askimet is disabledDouglas Barbosa Alexandre2016-02-022-6/+11
| | | | | | | |
| * | | | | | | Memoize Akismet client initialization on AkismetHelperDouglas Barbosa Alexandre2016-02-021-2/+2
| | | | | | | |