summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Update tooltip values to meet design specsrverissimo-master-patch-43755Rayana Verissimo2019-07-202-3/+6
|
* Fix the project auto devops APINick Thomas2019-07-193-6/+4
| | | | | | | | | | | | | If `project_auto_devops.enabled` is nil for a project, when setting any auto devops values via the API, we try to create a new row in the DB, instead of re-using the existing one. This leads to the project_id being set to nil, and the database `NOT NULL` constraint leading to a 500 response. This commit resolves the issue by correctly detecting the presence of a ProjectAutoDevops row and re-using it. Persistence is also moved away from explicit `update!` calls and into relying on `autosave: true` on the model.
* Merge branch '64160-fix-duplicate-buttons' into 'master'Fatih Acet2019-07-191-14/+11
|\ | | | | | | | | | | | | Remove duplicate buttons Closes #64160 See merge request gitlab-org/gitlab-ce!30757
| * Remove duplicate buttons64160-fix-duplicate-buttonsSamantha Ming2019-07-171-14/+11
| |
* | Fixes the alignment on reportsSam Beckham2019-07-192-4/+2
| | | | | | | | - Removes a justify-center class that causes reports to centrally align
* | Merge branch '64265-center-loading-icon' into 'master'Phil Hughes2019-07-191-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Centers loading icon in CI action Closes #64265 See merge request gitlab-org/gitlab-ce!30947
| * | Centers loading icon in CI actionFilipa Lacerda2019-07-191-0/+5
| | |
* | | Merge branch 'add-metadata-to-epic-list-view-ce' into 'master'Sean McGivern2019-07-191-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Use `issuable_path` helper See merge request gitlab-org/gitlab-ce!30913
| * | | Use issuable_path to allow support of epicsBrett Walker2019-07-181-2/+2
| | | |
* | | | Fixed regression for re-naming files in WebIDE64784-re-name-regressionDenys Mishunov2019-07-191-4/+8
| | | |
* | | | Added Usage Data for some Web IDE actionsFrancisco Javier López2019-07-195-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The actions tracked in the web IDE are: - creation of commits - creation of merge requests - projects loaded
* | | | Add endsWith to polyfillSamantha Ming2019-07-191-0/+1
| |/ / |/| |
* | | Merge branch '64295-predictable-environment-slugs' into 'master'Lin Jen-Shin2019-07-191-45/+2
|\ \ \ | | | | | | | | | | | | | | | | Use predictable environment slugs See merge request gitlab-org/gitlab-ce!30551
| * | | Introduce predictable environment slugs64295-predictable-environment-slugsTiger2019-07-191-45/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If an environment slug is predictable given only the environment name, we can use the environment slug earlier in the CI variable evaluation process as we don't have to wait for the environment record itself to be persisted.
* | | | Removes EE differences for issue boardsFilipa Lacerda2019-07-192-1/+23
| | | |
* | | | add stub to the boardsStore to spy on it and be able to use ↵Eduardo Mejía2019-07-191-4/+7
|/ / / | | | | | | | | | toHaveBeenCalledWith for the pre-defined labels test
* | | Merge branch 'an-sidekiq-chaos' into 'master'Lin Jen-Shin2019-07-188-34/+95
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds chaos endpoints to Sidekiq Closes #64663 See merge request gitlab-org/gitlab-ce!30814
| * | | Adds chaos endpoints to Sidekiqan-sidekiq-chaosAndrew Newdigate2019-07-188-34/+95
| | | | | | | | | | | | | | | | | | | | This allows the chaos endpoints to be invoked in Sidekiq so that this environment can be tested for resilience.
* | | | CE port for milestones should not be set on epics issue promotionEugenia Grieff2019-07-182-0/+9
| | | |
* | | | Merge branch 'group-milestones-dashboard-blunceford' into 'master'Sean McGivern2019-07-181-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug in dashboard display of closed milestones Closes #59381 See merge request gitlab-org/gitlab-ce!30820
| * | | | Fix bug with closed milestones in dashboardblunceford2019-07-161-2/+1
| | | | |
* | | | | Merge branch 'rs-haml-lint-rubocop-syntax' into 'master'Stan Hu2019-07-182-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Enable RuboCop syntax linting in haml-lint Closes #64753 See merge request gitlab-org/gitlab-ce!30903
| * | | | Fix syntax errors in devise/sessions/_new_ldapRobert Speicher2019-07-181-2/+2
| | | | |
| * | | | Fix haml-lint RuboCop error in admin/users/indexRobert Speicher2019-07-181-1/+1
| | | | |
* | | | | Merge branch 'bjk/usage_ping' into 'master'Stan Hu2019-07-181-0/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Update usage ping cron behavior See merge request gitlab-org/gitlab-ce!30842
| * | | | Update usage ping cron behaviorbjk/usage_pingBen Kochie2019-07-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Splay the start by sleeping up to one minute. * Adjust sideikiq retries to try up to approximately three hours. * Randomize the minute fully within the hour. * Psudo-randomize the day of the week based on the instance UUID.
* | | | | Add profile mode to extend request profilingadd-profile-mode-to-extend-request-profilingQingyu Zhao2019-07-182-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the support for "X-Profile-Token: <token>" to have an additional header that defines type of profile we are looking for, like: X-Profile-Mode: execution X-Profile-Mode: memory
* | | | | Refactor common Page Objects to use data tagsDan Davison2019-07-185-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Common usages within GitLab QA include Login Page, navigation bars and layouts
* | | | | Merge branch 'webide-commit-use-correct-parent' into 'master'Nick Thomas2019-07-184-9/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use correct parent when committing in WebIDE See merge request gitlab-org/gitlab-ce!29598
| * | | | | FE remove create branch call in IDE commitwebide-commit-use-correct-parentPaul Slaughter2019-07-182-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously `start_sha` was intercepted on the frontend to create the correct branch in a separate API call. Now that the commits API supports the `start_sha` parameter directly this workaround is not needed anymore.
| * | | | | Add start_sha to commits APIMarkus Koller2019-07-182-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing start_branch on committing from the WebIDE, it's possible that the branch has changed since editing started, which results in the change being applied on top of the latest commit in the branch and overwriting the new changes. By passing the start_sha instead we can make sure that the change is applied on top of the commit which the user started editing from.
* | | | | | Merge branch 'adjust-cycle-analytics-to-group-level' into 'master'Sean McGivern2019-07-188-11/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust cycle analytics to group level See merge request gitlab-org/gitlab-ce!30391
| * | | | | | Add code review remarksMałgorzata Ksionek2019-07-162-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change small things for better readability
| * | | | | | Add code review remarksMałgorzata Ksionek2019-07-163-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make specs more readable
| * | | | | | Add class for group level analyticsMałgorzata Ksionek2019-07-158-11/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs for group level Update entities Update base classes Add groups-centric changes Update plan and review stage Add summary classes Add summary spec Update specs files Add to specs test cases for group Add changelog entry Add group serializer Fix typo Fix typo Add fetching namespace in sql query Update specs Add rubocop fix Add rubocop fix Modify method to be in sync with code review Add counting deploys from subgroup To group summary stage Add subgroups handling In group stage summary Add additional spec Add additional specs Add more precise inheritance Add attr reader to group level Fix rubocop offence Fix problems with specs Add cr remarks Renaming median method and a lot of calls in specs Move spec setup Rename method in specs Add code review remarks regarding module Add proper module name
* | | | | | | Ensure visibility icons in group/project listings are greyDennis Tang2019-07-183-6/+2
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Project listing icons now use the `text-secondary` class - Group listing icons now use the `text-secondary` class - Unnecessary CSS was removed from groups.scss as a result
* | | | | | Localize updated text on projects list pageClement Ho2019-07-181-1/+1
| | | | | |
* | | | | | Perform more redactions in Redis performance bar tracesDietrich Stein2019-07-184-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HMSET and AUTH commands were not properly redacted. This commit does that and adds a test. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64309
* | | | | | Move boards switcher partialWinnie Hellmann2019-07-176-4/+603
| |/ / / / |/| | | | | | | | | | | | | | (cherry picked from commit a82e4d57a6fbba840a8a944e372b80866a1e48cc)
* | | | | Merge branch 'remove_clusters_cte_feature_flag' into 'master'Douglas Barbosa Alexandre2019-07-171-22/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes clusters_cte feature flag Closes #64259 See merge request gitlab-org/gitlab-ce!30827
| * | | | | Removes clusters_cte feature flagremove_clusters_cte_feature_flagThong Kuah2019-07-171-22/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been enabled on production without issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64259
* | | | | | Merge branch '10009-boards-index' into 'master'Phil Hughes2019-07-172-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for modal issues board See merge request gitlab-org/gitlab-ce!30836
| * | | | | | Removes EE differences for modal issues board10009-boards-indexFilipa Lacerda2019-07-172-1/+3
| | | | | | |
* | | | | | | Resolve "Label picker: Line break on long label titles"Ammar Alakkad2019-07-172-1/+6
| | | | | | |
* | | | | | | Added submodule links to Submodule type in GraphQL APIIgor2019-07-1710-38/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of migration of Folder View to Vue
* | | | | | | Add docs for Let's Encrypt integrationVladimir Shushlin2019-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add deprecation warning to old integration * Add user docs * Add admin docs
* | | | | | | Fix wrong pages access level defaultVladimir Shushlin2019-07-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Set access level in before_validation hook - Add post migration for updating existing project_features
* | | | | | | Do Redis lookup in batches in ActiveSession.sessions_from_idsImre Farkas2019-07-171-4/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By doing smaller mget calls to Redis, it can better schedule the workload. Currently a single mget with a lot of keys can keep Redis busy for long, while nothing in its queue gets processed.
* | | | | | Fetch latest link in the description for zoom link, add more tests and ↵Rajendra kadam2019-07-173-27/+15
| | | | | | | | | | | | | | | | | | | | | | | | remove frontend spec unnecessary tests
* | | | | | Merge branch 'qa-selector-uniformization-common-2' into 'master'Mark Lapierre2019-07-172-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor common Page Objects to use data tags (No. 2 Contd.) See merge request gitlab-org/gitlab-ce!30763