summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'layout-nav-es-module' into 'master'Filipa Lacerda2017-12-202-42/+33
|\
| * Merge branch 'master' into layout-nav-es-modulelayout-nav-es-moduleFilipa Lacerda2017-12-2029-128/+183
| |\
| * | Changed layout_nav to ES modulePhil Hughes2017-12-192-42/+33
* | | Merge branch '39246-fork-and-import-jobs-should-only-be-marked-as-failed-when...Douwe Maan2017-12-204-36/+29
|\ \ \
| * | | Fork and Import jobs only get marked as failed when the number of Sidekiq ret...39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhaustedTiago Botelho2017-12-154-36/+29
* | | | Merge branch 'rs-blocks-json-serialization' into 'master'Douwe Maan2017-12-209-10/+26
|\ \ \ \ | |_|_|/ |/| | |
| * | | Only include the user's ID in the time_spent command's update hashRobert Speicher2017-12-192-3/+3
| * | | Add a JsonSerializationError class instead of raising SecurityErrorRobert Speicher2017-12-191-2/+4
| * | | Use UserSerializer instead of `User.to_json`Robert Speicher2017-12-195-7/+6
| * | | Accept arguments to blocked JSON serialization methodsRobert Speicher2017-12-191-1/+1
| * | | Add BlocksJsonSerialization model concern and include it in UserRobert Speicher2017-12-192-0/+15
* | | | Merge branch '41186-sidebar-too-much-vertical-scroll' into 'master'Phil Hughes2017-12-206-55/+17
|\ \ \ \
| * | | | Line up search dropdown with other nav dropdowns41186-sidebar-too-much-vertical-scrollAnnabel Dunstone Gray2017-12-192-8/+5
| * | | | Remove transitionend event from GL dropdownPhil Hughes2017-12-191-16/+8
| * | | | Remove block styling from search dropdownAnnabel Dunstone Gray2017-12-181-7/+0
| * | | | Fix sidebar height when performance bar enabledAnnabel Dunstone Gray2017-12-182-0/+6
| * | | | Remove all dropdown animations and set display: none if they're not openAnnabel Dunstone Gray2017-12-182-14/+2
| * | | | Remove extra height declarations in CSS; remove block styling from dropdownsAnnabel Dunstone Gray2017-12-184-15/+1
* | | | | Merge branch 'bvl-fix-unlinking-with-lfs-objects' into 'master'Douwe Maan2017-12-201-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Don't link LFS-objects multiple times.bvl-fix-unlinking-with-lfs-objectsBob Van Landuyt2017-12-191-1/+1
| | |_|/ | |/| |
* | | | Fix onion-skin re-entering stateClement Ho2017-12-191-0/+1
* | | | Remove related links in MR widget when empty stateClement Ho2017-12-194-14/+38
* | | | Show inline edit button for issuesClement Ho2017-12-194-14/+2
* | | | Fix tags in the Activity tab not being clickableMario de la Ossa2017-12-191-1/+2
* | | | Merge branch '36020-private-npm-modules' into 'master'Douwe Maan2017-12-193-4/+29
|\ \ \ \
| * | | | BlobViewer::PackageJson - if private link to homepageMario de la Ossa2017-12-181-3/+9
| * | | | Do not generate links for private NPM modules in blob viewMario de la Ossa2017-12-183-4/+23
* | | | | Merge branch 'zj-gitaly-pipelines-n-1' into 'master'Robert Speicher2017-12-196-35/+64
|\ \ \ \ \
| * | | | | Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-196-35/+64
* | | | | | Fix shortcut links on help pageClement Ho2017-12-193-4/+29
| |_|/ / / |/| | | |
* | | | | Merge branch 'fix-cluster-enviroment-missing' into 'master'Kamil Trzciński2017-12-198-0/+24
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Inverse the has_multiple_clusters? helper usagefix-cluster-enviroment-missingMatija Čupić2017-12-184-4/+4
| * | | | Hardcode clusters helper in CEMatija Čupić2017-12-181-1/+1
| * | | | Use helper for feature check in cluster partialsMatija Čupić2017-12-185-2/+15
| * | | | Revert save button caption changeMatija Čupić2017-12-161-1/+1
| * | | | Add environment scope field to cluster formsMatija Čupić2017-12-164-1/+8
| * | | | Allow environment_scope in cluster controllersMatija Čupić2017-12-163-0/+4
* | | | | Merge branch 'commit-diff-discussion-in-mr-context-fix-links' into 'master'41248-datetime_utility-calls-a-missing-lang-export-function-from-locale-index-js⛄️ Sean McGivern ⛄️2017-12-181-5/+10
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | rework the merge_request_version_params to use Object#tapcommit-diff-discussion-in-mr-context-fix-linksMicaël Bergeron2017-12-181-8/+4
| * | | | fix the commit diff discussion sending the wrong urlMicaël Bergeron2017-12-181-5/+14
* | | | | Merge branch 'use-queue_namespace' into 'master'Stan Hu2017-12-182-1/+2
|\ \ \ \ \
| * | | | | Add pipeline_creation:run_pipeline_schedule into Sidekiq queue listuse-queue_namespaceStan Hu2017-12-181-0/+1
| * | | | | Use queue_namespace rather than enqueue_inLin Jen-Shin2017-12-181-1/+1
| |/ / / /
* | | | | Merge branch 'ph-es-notes-module' into 'master'Filipa Lacerda2017-12-185-8/+14
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'ph-es-notes-module'ph-es-notes-modulePhil Hughes2017-12-1857-559/+655
| |\ \ \ \ \
| * | | | | | Export and use Notes ES modulePhil Hughes2017-12-155-8/+14
* | | | | | | Only render signout screen when user is signed outFilipa Lacerda2017-12-181-6/+7
| |_|/ / / / |/| | | | |
* | | | | | Merge branch '40871-todo-notification-count-shows-notification-without-having...Douwe Maan2017-12-184-8/+19
|\ \ \ \ \ \
| * | | | | | Reset todo counters when the target is deleted40871-todo-notification-count-shows-notification-without-having-a-todoSean McGivern2017-12-184-8/+19
* | | | | | | Merge branch '39298-list-of-avatars-2' into 'master'Rémy Coutable2017-12-181-11/+7
|\ \ \ \ \ \ \
View Lorry Controller Status