summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Remove code deprecated in pipeline process serviceGrzegorz Bizon2017-04-021-15/+0
|
* Merge branch '20914-project-home-width' into 'master' Clement Ho2017-04-012-4/+4
|\ | | | | | | | | | | | | 20914 Limits line length for project home page Closes #20914 See merge request !10346
| * 20914 Limits line length for project home pagetauriedavis2017-03-302-4/+4
| | | | | | | | fix lint issues
* | Merge branch ↵Douwe Maan2017-03-313-5/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '25556-prevent-users-from-disconnecting-gitlab-account-from-cas' into 'master' Prevent users from disconnecting gitlab account from CAS Closes #25556 See merge request !10282
| * | Prevent users from disconnecting gitlab account from CASTiago Botelho2017-03-313-5/+20
| | |
* | | Merge branch 'add-download-attr' into 'master' Alfredo Sumaran2017-03-316-5/+6
|\ \ \ | | | | | | | | | | | | | | | | Add download attribute to download links See merge request !10318
| * | | Add download attribute to download linksClement Ho2017-03-296-5/+6
| | | |
* | | | Merge branch '30276-move-top-badges' into 'master' Annabel Dunstone Gray2017-03-311-9/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30276 Move issue, mr, todos next to profile dropdown in top nav Closes #30276 See merge request !10347
| * | | | 30276 Move issue, mr, todos next to profile dropdown in top navtauriedavis2017-03-311-9/+9
| | | | |
* | | | | Merge branch 'nav-weird-gap-fix' into 'master' Annabel Dunstone Gray2017-03-311-0/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Fixed a gap underneath the scrolling inner page links See merge request !10325
| * | | | Fixed a gap underneath the scrolling inner page linksPhil Hughes2017-03-301-0/+8
| | | | |
* | | | | Refactor SearchController#showDongqing Hu2017-03-315-33/+82
| | | | |
* | | | | Merge branch 'forked-subquery-order' into 'master' Yorick Peterse2017-03-311-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery See merge request !10334
| * | | | | Remove unnecessary ORDER BY clause from `forked_to_project_id` subquerymhasbini2017-03-301-2/+4
| | | | | |
* | | | | | Merge branch '29929-jira-doc' into 'master' Sean McGivern2017-03-311-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to Jira service documentation Closes #29929 See merge request !10366
| * | | | | | Fix link to Jira service documentationJarka Kadlecova2017-03-311-1/+1
| | | | | | |
* | | | | | | Add metrics button to Environment Overview pageKushal Pandya2017-03-318-13/+108
| | | | | | |
* | | | | | | Merge branch 'sh-fix-unnecessary-queries' into 'master' Rémy Coutable2017-03-311-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate unnecessary queries that add ~500 ms of load time for a large issue See merge request !10365
| * | | | | | | Eliminate unnecessary queries that add ~500 ms of load time for a large issueStan Hu2017-03-301-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looking at the SQL log, we see useless queries such as: ``` D, [2017-03-22T03:25:00.726710 #2629] DEBUG -- : (235.9ms) SELECT MAX("project_authorizations"."access_level") AS maximum_access_level, "project_authorizations"."user_id" AS project_authorizations_user_id FROM "project_authorizations" WHERE "project_authorizations"."project_id" = 13083 AND 1=0 GROUP BY "project_authorizations"."user_id" [["project_id", 13083]] ```
* | | | | | | Handle parsing OpenBSD ps output properly to display sidekiqSebastian Reitenbach2017-03-312-4/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | infos on admin->monitoring->background
* | | | | | Merge branch '24861-stringify-group-member-details' into 'master'Clement Ho2017-03-301-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide form inputs for group member without editing rights Closes #24861 See merge request !7816
| * | | | | | Remove unnecessary variableKushal Pandya2017-02-281-2/+1
| | | | | | |
| * | | | | | Hide form inputs for user without accessKushal Pandya2017-02-271-2/+3
| | | | | | |
* | | | | | | Allow users to import GitHub projects to subgroupsDouglas Barbosa Alexandre2017-03-301-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch '29883-retry-button' into 'master' Annabel Dunstone Gray2017-03-301-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds container option for tooltip to prevent the button from losing round corners Closes #29883 See merge request !10317
| * | | | | | Adds container option for tooltip to prevent the button from losing round ↵Filipa Lacerda2017-03-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | corners
* | | | | | | Merge branch 'ipython-notebook-viewer-improvements' into 'master' Jacob Schatz2017-03-301-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added worksheets support to notebook viewer See merge request !10307
| * | | | | | | Added worksheets support to notebook viewerPhil Hughes2017-03-301-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Updated some Ruby code based on comments
* | | | | | | Merge branch '30063-builds-sidebar-stutter' into 'master' Filipa Lacerda2017-03-301-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add subnav height to sidebar scroll calculation Closes #30063 See merge request !10262
| * | | | | | | Add subnav height to sidebar scroll calculationAnnabel Dunstone Gray2017-03-281-1/+1
| | | | | | | |
* | | | | | | | group links select2 infinite scrollLuke "Jared" Bennett2017-03-302-15/+79
| | | | | | | |
* | | | | | | | Merge branch 'tc-cleanup-application-settings-spec' into 'master' Sean McGivern2017-03-301-9/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup application settings spec See merge request !10189
| * | | | | | | | Remove redundant code to convert restricted_levels to integersToon Claes2017-03-231-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ApplicationSetting#restricted_visibility_levels= now takes care of converting string formatted levels to integers.
* | | | | | | | | Merge branch '30248-fix-production-admin-fixture' into 'master' Sean McGivern2017-03-301-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix production admin fixture to use the new `Users::CreateService` Closes #30248 See merge request !10326
| * | | | | | | | | Fix production admin fixture to use the new `Users::CreateService`Rémy Coutable2017-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch '26595-fix-issue-preselected-template' into 'master' Rémy Coutable2017-03-301-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linking to new issue with selected template Closes #26595 See merge request !10155
| * | | | | | | | | | Fix linking to new issue with selected templateEric Eastwood2017-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/26595
* | | | | | | | | | | Merge branch '28799-todo-creation' into 'master' Sean McGivern2017-03-304-22/+24
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create todos only for new mentiones Closes #28799 See merge request !10279
| * | | | | | | | | | Create todos only for new mentionsJarka Kadlecova2017-03-294-22/+24
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '24784-system-notes-meta-data' into 'master' Sean McGivern2017-03-304-39/+76
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add metadata for system notes See merge request !9964
| * | | | | | | | | | Create metadata when creating system notesJarka Kadlecova2017-03-284-40/+63
| | | | | | | | | | |
| * | | | | | | | | | Add system_note_metadata modelJarka Kadlecova2017-03-282-1/+15
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jej-group-name-disclosure' into 'security'Sean McGivern2017-03-293-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent private group disclosure via parent_id See merge request !2077
* | | | | | | | | | Merge branch '29843-project-subgroup-transfer' into 'security'Rémy Coutable2017-03-291-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use full path for moving directories when changing namespace path See merge request !2078
* | | | | | | | | | Merge branch '29539-fix-pipelines-container-width-with-parallel-diff' into ↵Alfredo Sumaran2017-03-292-11/+29
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Reset container width when switching to pipelines MR tab Closes #29539 See merge request !10169
| * | | | | | | | | Reset container width when switching to pipelines MR tabEric Eastwood2017-03-282-11/+29
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29539
* | | | | | | | | Merge branch '23674-simplify-milestone-summary' into 'master' Jacob Schatz2017-03-2910-94/+186
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Simplify milestone summary" Closes #23674 See merge request !10096
| * | | | | | | | | prever #count over #size when calculating issue/mr totalsMike Greiling2017-03-291-12/+12
| | | | | | | | | |
| * | | | | | | | | combine milestone start and end dates in collapsed sidebarMike Greiling2017-03-272-9/+31
| | | | | | | | | |
| * | | | | | | | | add start date to sidebar and display dates on group and dashboard views ↵Mike Greiling2017-03-271-20/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when possible