delta/gitlab/gitlab-ce.git/app/controllers/concerns, branch diff-notes-refactor

delta/gitlab/gitlab-ce.git/app/controllers/concerns, branch diff-notes-refactor gitlab.com: gitlab-org/gitlab-ce.git Use reCaptcha when an issue identified as spam 2017-02-07T11:56:20+00:00 Jarka Kadlecova jarka@gitlab.com 2017-01-27T16:25:39+00:00 3d2954e4570d236a080b0d46698d96a28fd9acec

Merge branch 'fix-git-hooks-when-creating-file' into 'master' 2017-02-02T23:26:35+00:00 Douwe Maan douwe@gitlab.com 2017-02-02T23:26:35+00:00 e7d530a624fbb8854047c3983eaa0972a19f36c8 Don't execute git hooks if you create branch as part of other change Closes #23439 See merge request !7237


Don't execute git hooks if you create branch as part of other change

Closes #23439

See merge request !7237

Check public snippets for spam 2017-02-02T10:23:51+00:00 Sean McGivern sean@gitlab.com 2017-02-01T18:15:59+00:00 c63194ce6f952173649d7de4038aa96348e90565 Apply the same spam checks to public snippets (either personal snippets that are public, or public snippets on public projects) as to issues on public projects.

Apply the same spam checks to public snippets (either personal snippets
that are public, or public snippets on public projects) as to issues on
public projects.

Make sure different project gets a merge request 2017-01-26T14:37:22+00:00 Lin Jen-Shin godfat@godfat.org 2017-01-26T14:37:22+00:00 eb242fc865c032f6408f3b68700da9b840b416dd Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626479

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626479

@tree_edit_project is no longer used 2017-01-26T11:13:02+00:00 Lin Jen-Shin godfat@godfat.org 2017-01-26T11:13:02+00:00 acda0cd48d69dbd98ec9df8339f15139cd098726 Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626434

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626434

Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file 2017-01-26T09:21:38+00:00 Lin Jen-Shin godfat@godfat.org 2017-01-26T09:21:38+00:00 4587c78afa5ff5d2bab718bd632264764860d775 * upstream/master: (1122 commits) Update CHANGELOG.md for 8.16.2 Display project ID in project settings (!8572) fixed points from comments to improve code quality Update CHANGELOG.md for 8.14.8 Statisfy eslint Add CHANGELOG entry Fix access to the wiki code via HTTP when repository feature disabled Display fullscreen button on small screens (!5302) Prevent removing fields from dropdowns on input elements fix for all themes Return struct instead of multiple values Fix race conditions for AuthorizedProjectsWorker Add User#nested_groups and User#nested_projects methods Fix spec failure due to timestamp ordering issue in mySQL Fixed error with filter keyboard tests `can?` already includes the `feature_available?` check Test there is no Merge Request button when MRs are disabled Ensure the correct Merge Request button is found Add 409 conflict tests Add CHANGELOG ...

* upstream/master: (1122 commits)
  Update CHANGELOG.md for 8.16.2
  Display project ID in project settings (!8572)
  fixed points from comments to improve code quality
  Update CHANGELOG.md for 8.14.8
  Statisfy eslint
  Add CHANGELOG entry
  Fix access to the wiki code via HTTP when repository feature disabled
  Display fullscreen button on small screens (!5302)
  Prevent removing fields from dropdowns on input elements
  fix for all themes
  Return struct instead of multiple values
  Fix race conditions for AuthorizedProjectsWorker
  Add User#nested_groups and User#nested_projects methods
  Fix spec failure due to timestamp ordering issue in mySQL
  Fixed error with filter keyboard tests
  `can?` already includes the `feature_available?` check
  Test there is no Merge Request button when MRs are disabled
  Ensure the correct Merge Request button is found
  Add 409 conflict tests
  Add CHANGELOG
  ...

Fix other spec failures 2017-01-17T10:32:55+00:00 James Lopez james@jameslopez.es 2016-11-23T10:28:28+00:00 a67311cb4c9f54af43d300fde5240f9a370193d1

more refactoring and fixing old specs 2017-01-17T10:32:54+00:00 James Lopez james@jameslopez.es 2016-11-22T13:29:25+00:00 02e1e4819234662faddd7d8eb5c54d9bfdf9e7e6

Refactor allowed params in ServiceParams 2017-01-12T22:33:21+00:00 Rémy Coutable remy@rymai.me 2017-01-10T14:41:31+00:00 6195ab754dcaac0930f01dae86d39adf9ac0fce9 Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Rename from base to start because base could mean merge base 2017-01-06T15:29:13+00:00 Lin Jen-Shin godfat@godfat.org 2017-01-06T15:29:13+00:00 ccc73c455ba0b95b531c69414a6a1f47667f16b5