summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Changed variable namesbuild-scroll-controls-positionPhil Hughes2016-03-101-3/+3
|
* Removed CiBuild in favour of already available CiBuild classPhil Hughes2016-03-103-16/+13
|
* Affix the build scroll controlsPhil Hughes2016-03-074-5/+36
| | | | Closes #4709
* Merge branch 'rs-note-delegates-mentionable'Douwe Maan2016-03-071-10/+1
|\ | | | | | | | | # Conflicts: # app/models/note.rb
| * Delegate a Note's Mentionable methods to its noteable objectrs-note-delegates-mentionableRobert Speicher2016-03-051-10/+1
| |
* | Merge branch 'rs-remove-diffline' into 'master' Douwe Maan2016-03-071-3/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove unused DiffLine model Added in Mar 2014. Only usage removed in Sep 2014. See merge request !3105
| * | Remove unused DiffLine modelrs-remove-difflineRobert Speicher2016-03-051-3/+0
| |/ | | | | | | Added in Mar 2014. Only usage removed in Sep 2014.
* | Merge branch 'rs-note-reuse-for-methods' into 'master' Douwe Maan2016-03-071-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | Make better use of the `Note#for_*?` methods We've got all these polymorphic type-checking methods, might as well use 'em everywhere it makes sense. See merge request !3106
| * | Make better use of the `Note#for_*?` methodsrs-note-reuse-for-methodsRobert Speicher2016-03-051-2/+2
| |/ | | | | | | | | We've got all these polymorphic type-checking methods, might as well use 'em everywhere it makes sense.
* | Merge branch 'rs-note-model-cleanup' into 'master' Douwe Maan2016-03-071-8/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor Note model cleanup Remove `Note#noteable_type_name` This method was added in Dec 2012, its single use was removed two days later, and it's been there ever since. --- Remove `Note#system?` "override" This method was duplicating default Rails behavior. See merge request !3104
| * | Remove `Note#system?` "override"rs-note-model-cleanupRobert Speicher2016-03-051-4/+0
| | | | | | | | | | | | This method was duplicating default Rails behavior.
| * | Remove `Note#noteable_type_name`Robert Speicher2016-03-051-4/+0
| | | | | | | | | | | | | | | This method was added in Dec 2012, its single use was removed two days later, and it's been there ever since.
* | | Merge branch 'ci_quickstart' into 'master' Achilleas Pipinellis2016-03-061-11/+38
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Add a TL;DR version in quickstart guide See merge request !3026
| * | Add a TL;DR version in quick start guideci_quickstartAchilleas Pipinellis2016-03-011-11/+38
| | | | | | | | | | | | | | | | | | | | | Borrowed from a user's comment: https://gitlab.com/esr/reposurgeon/merge_requests/27#note_3158109 [ci skip]
* | | Merge branch 'master' into 'master' Robert Speicher2016-03-051-1/+1
|\ \ \ | |_|/ |/| | | | | | | | Reduce progress bar noise during brakeman run See merge request !3101
| * | Reduce progress bar noise during brakeman runPeter Suschlik2016-03-041-1/+1
| | |
* | | Merge branch 'issue_2805' into 'master' Douwe Maan2016-03-052-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade carrierwave to 0.10.0. Closes #2805 See merge request !3084
| * | | Upgrade carrierwave to 0.10.0.issue_2805Rubén Dávila2016-03-032-3/+4
| | | |
* | | | Merge branch 'issue-sidebar-mobile' into 'master' Dmitriy Zaporozhets2016-03-0512-49/+143
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue sidebar mobile Fixes #13592 Fixes #14037 See merge request !3050
| * | | | Uses the correct variable names for this situation.issue-sidebar-mobileJacob Schatz2016-03-041-2/+2
| | | | |
| * | | | Only save right sidebar position cookie if user did the collapsing.Jacob Schatz2016-03-042-6/+7
| | | | |
| * | | | Fixes style consistencies.Jacob Schatz2016-03-043-10/+9
| | | | |
| * | | | Fix remaining media queries using correct bs paradigms.Jacob Schatz2016-03-042-14/+13
| | | | |
| * | | | Correct media queries for small devices and tablets.Jacob Schatz2016-03-043-9/+13
| | | | |
| * | | | Sidebar overflow on xs side.Jacob Schatz2016-03-042-7/+7
| | | | |
| * | | | Combining recent change to have username in header with my MR.Jacob Schatz2016-03-042-6/+13
| | | | |
| * | | | Fix bugs with open and close buttonsJacob Schatz2016-03-044-22/+27
| | | | |
| * | | | Small outside aside shrink sidebar button for mobile only.Jacob Schatz2016-03-042-1/+14
| | | | |
| * | | | Open sidebar button on mobile.Jacob Schatz2016-03-044-6/+25
| | | | |
| * | | | Move static icon and change appearance.Jacob Schatz2016-03-044-13/+29
| | | | | | | | | | | | | | | | | | | | MR meta details media queries.
| * | | | Hide correct author info in header of issuable.Jacob Schatz2016-03-042-4/+10
| | | | |
| * | | | Change icons for open close on issue/MRJacob Schatz2016-03-046-21/+46
| | | | | | | | | | | | | | | | | | | | Button full width on phone on MR/issue.
* | | | | No options please.Sytse Sijbrandij2016-03-041-1/+2
| | | | |
* | | | | Merge branch 'rs-frontmatter-pre' into 'master' Robert Speicher2016-03-056-0/+110
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Properly display YAML front matter in Markdown See merge request !3072
| * | | | | Add YamlFrontMatterFilter to the PreProcessPipelineRobert Speicher2016-03-043-1/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This filter will detect YAML Front Matter and convert it to an HTML table for prettier formatting.
| * | | | | Add a PreProcessPipelineRobert Speicher2016-03-024-0/+28
| | | | | |
* | | | | | Merge branch 'rs-no-default-credentials' into 'master' Douwe Maan2016-03-044-25/+82
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the initial admin to set a password Closes #1980 See merge request !3068
| * | | | | | Allow the initial admin to set a passwordrs-no-default-credentialsRobert Speicher2016-03-044-25/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1980
* | | | | | | Merge branch 'rs-organize-factories' into 'master' Douwe Maan2016-03-0441-266/+255
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factory cleanup Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/5880 See merge request !2847
| * | | | | | | Don't generate factories automaticallyRobert Speicher2016-03-041-0/+4
| | | | | | | |
| * | | | | | | Move all factory definitions to their own fileRobert Speicher2016-03-0438-258/+243
| | | | | | | |
| * | | | | | | Bump factory_girl_rails to ~> 4.6.0Robert Speicher2016-03-042-8/+8
| | | | | | | |
* | | | | | | | Merge branch 'rs-update_merge_request' into 'master' Douwe Maan2016-03-041-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move `update_merge_request` ability to Developer Closes #13663 See merge request !3099
| * | | | | | | Move `update_merge_request` ability to DeveloperRobert Speicher2016-03-041-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Closes #13663
* | | | | | | Merge branch 'rs-wiki-pipeline-spec' into 'master' Douwe Maan2016-03-043-47/+65
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a spec for WikiPipeline Removes the specs from GollumTagsFilter that were more like integration tests for the pipeline than unit tests of the filter. See merge request !3054
| * | | | | | | Replace `[[_TOC_]]` tag even if `toc` result is blankrs-wiki-pipeline-specRobert Speicher2016-03-033-6/+8
| | | | | | | |
| * | | | | | | Add a spec for WikiPipelineRobert Speicher2016-03-012-44/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the specs from GollumTagsFilter that were more like integration tests for the pipeline than unit tests of the filter.
* | | | | | | | Merge branch 'fix/sentry-1182' into 'master' Douwe Maan2016-03-041-6/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In UsersController#calendar_activities, when Date isn't parsable, fallback to Date.today For some reason, GoogleBot accesses `/u/:username/calendar_activities` without a `:date` param, but then the view was trying to call `#to_s(:short)` which doesn't exist on `nil`, leading to the following Sentry report: https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/ See merge request !3074
| * | | | | | | In UsersController#calendar_activities, when Date isn't parsable, fallback ↵fix/sentry-1182Rémy Coutable2016-03-031-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to Date.today For some reason, GoogleBot accesses /u/:username/calendar_activities without a :date param, but then the view was trying to call #to_s(:short) which doesn't exist on nil, leading to the following Sentry report: https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/
* | | | | | | | Merge branch 'ctr-enter-textarea-mac' into 'master' Jacob Schatz2016-03-041-4/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ctrl+enter on mac correctly submits forms Closes #4177 See merge request !3089
View Lorry Controller Status