summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix test3478-copy-commit-hash-to-clipboardVictor Wu2016-12-121-1/+1
|
* Tweak style and add back wordingvictorwu2016-12-121-1/+2
|
* Clean up commit copy to clipboard and make consistentvictorwu2016-12-124-15/+6
|
* Merge branch '25106-hide-issue-mr-button-for-not-loggedin' into 'master' Fatih Acet2016-12-123-5/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hide new issue or MR button for not signed users for a group ## What does this MR do? This MR prevents user creating issues or MR without signing in ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? This issue is needed to ensure an user to be logged in before creating an issue or MR ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] All builds are passing - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25106 See merge request !7902
| * removes extra if check25106-hide-issue-mr-button-for-not-loggedinNur Rony2016-12-121-5/+4
| |
| * hides new MR button from not loggedin userNur Rony2016-12-121-2/+3
| |
| * adds changelogNur Rony2016-12-121-0/+4
| |
| * adds check for logged in user in group issuesNur Rony2016-12-121-7/+8
| |
* | Merge branch '19990-update-snippets-page-design' into 'master' Fatih Acet2016-12-1218-122/+187
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Updated UI for Snippets pages" ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #19990 See merge request !7861
| * | rename snippets_path helper due to conflict19990-update-snippets-page-designMike Greiling2016-12-102-5/+5
| | |
| * | add new tests for snippets_finder.rbMike Greiling2016-12-101-1/+24
| | |
| * | use Snippet.none in favor of nil to allow chainingMike Greiling2016-12-101-1/+1
| | |
| * | implement snippets_scope_menu partial to reduce code duplicationMike Greiling2016-12-104-53/+45
| | |
| * | refactor duplicate code into a by_scope methodMike Greiling2016-12-101-35/+19
| | |
| * | move snippet edited timeago under the snippet titleMike Greiling2016-12-102-8/+14
| | |
| * | fix snippets reference id in search results (should be $ not #)Mike Greiling2016-12-101-1/+1
| | |
| * | conditionally display assoc project info in snippets indexMike Greiling2016-12-104-4/+13
| | |
| * | fix failing testsMike Greiling2016-12-103-4/+4
| | |
| * | update snippets list designMike Greiling2016-12-102-13/+20
| | |
| * | ensure all snippets count badge is accurate for non team membersMike Greiling2016-12-101-1/+4
| | |
| * | move project new snippet button into snippet scope navigation headerMike Greiling2016-12-101-27/+31
| | |
| * | add scope filters to project snippets pageMike Greiling2016-12-103-7/+52
| | |
| * | move new snippet button to main snippet navigation blockMike Greiling2016-12-103-48/+42
| | |
| * | remove plus icon in "new snippet" buttonMike Greiling2016-12-101-2/+0
| | |
| * | invert snippet action buttonsMike Greiling2016-12-102-4/+4
| | |
| * | remove unused class nameMike Greiling2016-12-102-4/+4
| | |
| * | update action button order for snippets pageMike Greiling2016-12-102-12/+12
| | |
* | | Merge branch 'grapify-service-api' into 'master' Rémy Coutable2016-12-1210-84/+709
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Grapify the service API Related to #22928 See merge request !7970
| * | | Grapify the service APIgrapify-service-apiRobert Schilling2016-12-122-7/+17
| | | |
| * | | Grapify the service APIRobert Schilling2016-12-0911-85/+700
| | | |
* | | | Merge branch '25429-fix-awkward-wording-in-cherry-pick-and-revert-errors' ↵Alfredo Sumaran2016-12-122-6/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Fix awkward wording in "cherry-pick" and "revert" errors." ## What does this MR do? Fixes a poorly worded error message as well as some other minor bugs I encountered while investigating #21812. ## Are there points in the code the reviewer needs to double check? Should be pretty straight forward. ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] ~~[Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added~~ - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [ ] ~~Added for this feature/bug~~ - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Originally a part of #21812 Closes #25429 See merge request !7981
| * | | | prevent create_merge_request form field helpers from generating an id value25429-fix-awkward-wording-in-cherry-pick-and-revert-errorsMike Greiling2016-12-101-2/+2
| | | | |
| * | | | fix awkward verb conjugation in cherry-pick and revert errorsMike Greiling2016-12-101-1/+1
| | | | |
| * | | | remove unnecessary nonce idMike Greiling2016-12-101-3/+2
| | | | |
| * | | | fix broken string interpolationMike Greiling2016-12-101-1/+1
| | |/ / | |/| |
* | | | Merge branch 'cs-update-sidekiq-427' into 'master' Rémy Coutable2016-12-122-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Sidekiq from 4.2.1 to 4.2.7. Includes various bug fixes, mostly for Rails 5. Changelog: https://github.com/mperham/sidekiq/blob/fc168fe393bee3ad1fcbb52cff2d84af86c38cc4/Changes.md See merge request !8032
| * | | | Update Sidekiq from 4.2.1 to 4.2.7.cs-update-sidekiq-427Connor Shea2016-12-112-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes various bug fixes, mostly for Rails 5. Changelog: https://github.com/mperham/sidekiq/blob/fc168fe393bee3ad1fcbb52cff2d84af86c38cc4/Changes.md
* | | | | Merge branch '25483-broken-tabs' into 'master' Fatih Acet2016-12-129-10/+57
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix TypeError: Cannot read property 'initTabs' ## What does this MR do? Adds a default value to the `options` argument in order to prevent errors when `Pipelines` is initialised without arguments. Adds tests to guarantee this does not happen again. Adds back removed pipeline class to make the pipeline graph visible, `js-pipeline-graph` ## Why was this MR needed? In the places where `Pipelines` is initialised without arguments it throws an error: `TypeError: Cannot read property 'initTabs'` ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25483 Closes #25493 See merge request !8009
| * | | | | Fix tests25483-broken-tabsFilipa Lacerda2016-12-126-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fix broken tests
| * | | | | Fix Pipeline graph disappeared from the builds tab in commits and merge ↵Filipa Lacerda2016-12-122-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | request views
| * | | | | Adds tests to prevent future errors.Filipa Lacerda2016-12-124-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | Fix undefined variable in es5
| * | | | | Fix TypeError: Cannot read property 'initTabs'Filipa Lacerda2016-12-122-1/+5
| | | | | |
* | | | | | Merge branch 'unescape-relative-path' into 'master' Gabriel Mazetto2016-12-123-9/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid escaping relative links in Markdown twice ## What does this MR do? Avoid escaping relative links in Markdown twice. ## Why was this MR needed? Relative links with special characters (e.g. spaces) were escaped twice. ## What are the relevant issue numbers? closes #25191, #25318 See merge request !7940
| * | | | | | Avoid escaping relative links in Markdown twice (!7940)winniehell2016-12-122-8/+10
| | | | | | |
| * | | | | | Add failing test for #25191winniehell2016-12-051-1/+1
| | | | | | |
* | | | | | | Merge branch '24807-stop-ddosing-ourselves' into 'master' Fatih Acet2016-12-124-77/+105
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop DDOSing ourselves ## What does this MR do? Adds `hiddenInterval` to `SmartInterval` settings. This will be the interval used whilst the tab is inactive. If this setting is not set it will `cancel` as it would have done before. Adds `immediateExecution` to `SmartInterval` settings. This boolean will dictate whether to execute the callback once before the first interval or not. Uses `SmartInterval` with the new `hiddenInterval` settings to slow the polling for the MR widget on inactive tabs. Fixes issue where `SmartInterval`s `visibilitychange` listeners are not getting called because jQuery doesn't support them. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? We're ddosing ourselves on the MR page. ## Screenshots (if relevant) ![Screen_Shot_2016-11-25_at_18.36.25](/uploads/c4457c55872f592e921a50cf5462022e/Screen_Shot_2016-11-25_at_18.36.25.png) ~30 seconds difference between the first 2 requests _(a couple requests had fired already so it's backed off already)_. _-changed to different tab-_ ~2 minutes difference between the middle 2 requests. _-changed tab back to MR-_ ~10 seconds difference between the last 2 requests. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24807 See merge request !7762
| * | | | | | | Added hiddenInterval and immediateExecution settings, fixed visibilitychange ↵24807-stop-ddosing-ourselvesLuke "Jared" Bennett2016-12-124-77/+105
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | listening, implemented with mr widget Updated tests Added tests Review changes
* | | | | | | Merge branch 'api-fix-group-projects-filter' into 'master' Rémy Coutable2016-12-122-1/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Add the project filter to the groups endpoint. Related to #22928. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25420 See merge request !8034
| * | | | | | | API: Fix groups filterRobert Schilling2016-12-122-1/+21
| | | | | | | |
* | | | | | | | Merge branch 'issue_25030' into 'master' Sean McGivern2016-12-123-8/+43
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow branch names with dots on API endpoint closes #25030 See merge request !7963
View Lorry Controller Status