summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix UX Guide apostrophe use for singular common nounspatch-12Pedro Moreira da Silva2017-02-131-192/+192
|
* Merge branch 'make-rubocop-happy-again' into 'master'Rémy Coutable2017-02-132-2/+2
|\ | | | | | | | | Use safe navigation operator to make rubocop happy See merge request !9185
| * Use safe navigation operator to make rubocop happywinniehell2017-02-132-2/+2
| |
* | Merge branch '24976-start-of-line-mention' into 'master' Sean McGivern2017-02-1314-24/+411
|\ \ | | | | | | | | | | | | | | | | | | Feature to create directly addressed Todos when mentioned in beginning Closes #24976 See merge request !7926
| * | Create directly_addressed Todos when mentioned in beginning of a lineErshad Kunnakkadan2017-02-0814-24/+411
| | |
* | | Merge branch 'issue-boards-docs-update' into 'master' Achilleas Pipinellis2017-02-136-24/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Updated issue boards docs Closes #27872 See merge request !9097
| * | | Update issue boards docsAchilleas Pipinellis2017-02-133-21/+20
| | | |
| * | | Updated copyissue-boards-docs-updatePhil Hughes2017-02-101-6/+6
| | | |
| * | | Added missing filter wordPhil Hughes2017-02-091-2/+2
| | | |
| * | | Documented removing issuePhil Hughes2017-02-092-0/+8
| | | |
| * | | Updated issue boards docsPhil Hughes2017-02-094-17/+13
| | | |
* | | | Merge branch '20732_member_exists_409' into 'master'Sean McGivern2017-02-137-12/+487
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Add member: Always return 409 when a member exists Closes #20732 See merge request !9093
| * | | Add member: Always return 409 when a member existsJarka Kadlecova2017-02-107-12/+487
| | | |
* | | | Merge branch '27608-fixes-markdown-in-activity-feed-is-light-gray' into ↵Filipa Lacerda2017-02-132-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' removes grayish blue color for events activity Closes #27608 See merge request !9179
| * | | | Fixes markdown in activity feed is light gray27608-fixes-markdown-in-activity-feed-is-light-grayNur Rony2017-02-132-1/+4
| | | | |
* | | | | Merge branch 'issue_25900_2' into 'master' Sean McGivern2017-02-1317-36/+199
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gather issuable metadata to avoid n+ queries on index view Closes #25900 See merge request !9006
| * | | | | Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-0917-36/+199
| | | | | |
* | | | | | Merge branch 'zj-drop-ruby-21-tests' into 'master' Rémy Coutable2017-02-1320-47/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Rubocop to Ruby 2.3 See merge request !8994
| * | | | | | Update Rubocop to ruby 2.3zj-drop-ruby-21-testsZ.J. van de Weg2017-02-0720-47/+35
| | | | | | |
* | | | | | | Merge branch 'docs/merge_requests_index' into 'master' Achilleas Pipinellis2017-02-134-180/+178
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move merge requests index file inside the merge_requests dir See merge request !9181
| * | | | | | | Move merge requests index file inside the merge_requests dirAchilleas Pipinellis2017-02-134-180/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'fix_issue_from_milestone' into 'master'Rémy Coutable2017-02-135-3/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue from milestone See merge request !8895
| * | | | | | | | fix issue creation from milestone doesn't assign the milestonewendy04022017-02-125-3/+25
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'concurrent-foreign-keys' into 'master'Rémy Coutable2017-02-138-10/+183
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Add method for creating foreign keys concurrently See merge request !9069
| * | | | | | | Enforce use of add_concurrent_foreign_keyconcurrent-foreign-keysYorick Peterse2017-02-106-3/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a Rubocop rule to enforce the use of add_concurrent_foreign_key instead of the regular add_foreign_key method. This cop has been disabled for existing migrations so we don't need to change those.
| * | | | | | | Add method for creating foreign keys concurrentlyYorick Peterse2017-02-102-7/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method allows one to create foreign keys without blocking access to the source table, but only on PostgreSQL. When creating a regular foreign key the "ALTER TABLE" statement used for this won't return until all data has been validated. This statement in turn will acquire a lock on the source table. As a result this lock can be held for quite a long amount of time, depending on the number of rows and system load. By breaking up the foreign key creation process in two steps (creation, and validation) we can reduce the amount of locking to a minimum. Locking is still necessary for the "ALTER TABLE" statement that adds the constraint, but this is a fast process and so will only block access for a few milliseconds.
* | | | | | | | Merge branch 'rename_files_delete_service' into 'master' Rémy Coutable2017-02-135-7/+11
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Rename Files::DeleteService to Files::DestroyService See merge request !9110
| * | | | | | | Rename Files::DeleteService to Files::DestroyServicedixpac2017-02-105-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason for renaming is to comply with naming convention of services in codebase.
* | | | | | | | Merge branch '28029-improve-blockquote-formatting-on-emails' into 'master'Annabel Dunstone Gray2017-02-112-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve blockquote formatting in notification emails" Closes #28029 See merge request !9157
| * | | | | | | | Add CHANGELOG file28029-improve-blockquote-formatting-on-emailsAlfredo Sumaran2017-02-101-0/+4
| | | | | | | | |
| * | | | | | | | Stylize blockquote in notification emailsAlfredo Sumaran2017-02-101-0/+7
| | | | | | | | |
* | | | | | | | | Merge branch 'clean-javascript-vendor-files' into 'master' Filipa Lacerda2017-02-1115-9095/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert some vendored javascript assets to npm modules See merge request !8990
| * | | | | | | | | convert js-cookie dependency to an npm moduleclean-javascript-vendor-filesMike Greiling2017-02-115-4/+5
| | | | | | | | | |
| * | | | | | | | | convert timeago.js dependency to an npm moduleMike Greiling2017-02-115-240/+4
| | | | | | | | | |
| * | | | | | | | | remove vue from vendor since it is now in node_modulesMike Greiling2017-02-116-8851/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch '27994-fix-mr-widget-jump' into 'master' Filipa Lacerda2017-02-103-6/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes MR widget jump Closes #27994 See merge request !9146
| * | | | | | | | Merge branch 'master' into 27994-fix-mr-widget-jumpFilipa Lacerda2017-02-1057-189/+402
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits) Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master' " Fix broken test to use trigger in order to not take tooltip overlaping in consideration Fix job to pipeline renaming Added env external link and light web terminal spec Don't perform Devise trackable updates on blocked User records Replace teaspoon references with Karma Add changelog Only show MR widget graph if there are stages Remove orange caret icon from mr widget Add index to ci_trigger_requests for commit_id rspec_profiling: Discover the correct branch name in GitLab CI Show parent group members for nested group Fix tooltip scss for anchors. Adds css for button's tooltips to have similar behavior. Removes padding from mini graph table cell to guarantee stages don't break line on hover Updated protected branches dropdown image in docs Fix admin_labels_spec.rb transient failure Make sure events have most properties defined Restore exposure of legend property for events moved hyperlink reference section at the end of the content Make sure our current .gitlab-ci.yml is valid adds changelog ...
| * | | | | | | | adds changelog27994-fix-mr-widget-jumpNur Rony2017-02-101-0/+4
| | | | | | | | |
| * | | | | | | | fixes MR widget jumpNur Rony2017-02-102-6/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'static-navbar' into 'master' Jacob Schatz2017-02-1022-70/+62
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove fixed positioning from navbar See merge request !7547
| * | | | | | | | Add js prefix to right sidebarAnnabel Dunstone Gray2017-02-105-5/+8
| | | | | | | | |
| * | | | | | | | Replace accidentally deleted metaclickAnnabel Dunstone Gray2017-02-101-0/+8
| | | | | | | | |
| * | | | | | | | Remove right padding from navbar-collapse on large screensAnnabel Dunstone Gray2017-02-101-0/+4
| | | | | | | | |
| * | | | | | | | Add changelogAnnabel Dunstone Gray2017-02-101-0/+4
| | | | | | | | |
| * | | | | | | | common_utils merge conflictsAnnabel Dunstone Gray2017-02-101-3/+1
| | | | | | | | |
| * | | | | | | | Set sidebar height to 100% if at top of pageAnnabel Dunstone Gray2017-02-101-0/+2
| | | | | | | | |
| * | | | | | | | Set height of fixed sidebars with jsAnnabel Dunstone Gray2017-02-102-1/+11
| | | | | | | | |
| * | | | | | | | Add sticky sidebar on wiki pageAnnabel Dunstone Gray2017-02-102-2/+2
| | | | | | | | |
| * | | | | | | | Fix comment button test for slash commandsAnnabel Dunstone Gray2017-02-101-1/+1
| | | | | | | | |
| * | | | | | | | Fix time tracking specAnnabel Dunstone Gray2017-02-101-1/+1
| | | | | | | | |